diff --git a/r8.jar b/r8.jar
index 131437e..d0fd0fa 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index 32cc515..9447c4c 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 2.1.1-dev
+# compiler_version: 2.1.4-dev
 # compiler_hash: engineering
-# pg_map_id: 1b940fe
+# pg_map_id: 81b8a75
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -167,10 +167,9 @@
     9:9:void lambda$addClasspathFile$5(java.nio.file.Path):227:227 -> b
     10:10:void lambda$addDexProgramData$8(byte[],com.android.tools.r8.origin.Origin):244:244 -> b
     11:11:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260:260 -> b
-    12:12:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):942:942 -> b
+    12:12:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):945:945 -> b
     12:12:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260 -> b
-    13:14:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:263 -> b
-    15:15:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:262 -> b
+    13:15:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:262 -> b
     16:16:void setIgnoreDexInArchive(boolean):350:350 -> b
     1:6:com.android.tools.r8.BaseCommand build():138:143 -> build
     com.android.tools.r8.BaseCommand makeCommand() -> c
@@ -261,8 +260,8 @@
     3:3:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):507 -> addAssertionsConfiguration
     4:4:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):507:507 -> addAssertionsConfiguration
     5:7:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):506:508 -> addAssertionsConfiguration
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):456:457 -> addDesugaredLibraryConfiguration
-    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):456:458 -> addDesugaredLibraryConfiguration
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):456:456 -> addDesugaredLibraryConfiguration
+    5:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):458:458 -> addDesugaredLibraryConfiguration
     6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):463:464 -> addDesugaredLibraryConfiguration
     1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):450:450 -> addSpecialLibraryConfiguration
     1:37:void validate():513:549 -> e
@@ -400,21 +399,18 @@
     16:17:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):138:139 -> a
     18:18:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> a
     18:18:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):139 -> a
-    19:19:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):192:192 -> a
-    20:20:void lambda$run$4(java.lang.String):202:202 -> 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):248:250 -> 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):368:368 -> 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):250 -> 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):251:255 -> a
+    19:19:void lambda$run$4(java.lang.String):202:202 -> a
+    20: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):250:250 -> 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):366:366 -> 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):250 -> a
+    22:22: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):251:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):104:104 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):143:145 -> c
     1:30:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):152:181 -> d
-    31:31: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):364:364 -> d
+    31:31: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):362:362 -> d
     31:31:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):181 -> d
-    32:42:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):182:192 -> d
-    43:47:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:192 -> d
-    48:98:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:236 -> d
-    99:104:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):231:236 -> d
+    32:86:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):182:236 -> d
+    87:92:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):231:236 -> d
     1:5:void main(java.lang.String[]):129:133 -> main
     1:5:void run(com.android.tools.r8.D8Command):77:81 -> run
     6:6:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> run
@@ -603,16 +599,24 @@
     3:3:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> a
     3:3:void run(com.android.tools.r8.D8Command,java.lang.Boolean,java.util.Map):64 -> a
     4:4:void lambda$run$0(com.android.tools.r8.D8Command,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):66:66 -> a
-    5:45:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):75:115 -> a
-    46:51:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):110:115 -> a
-    52:54:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):121:123 -> a
-    55:55:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    55:55:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39 -> a
-    56:56:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39:39 -> a
-    57:57:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    57:57:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):40 -> a
-    58:75:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):40:57 -> a
-    76:87:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):44:55 -> a
+    5:22:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):75:92 -> a
+    23:23:com.android.tools.r8.graph.DexApplication com.android.tools.r8.D8.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):250:250 -> a
+    23:23:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):93 -> 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):366:366 -> a
+    24:24:com.android.tools.r8.graph.DexApplication com.android.tools.r8.D8.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):250 -> a
+    24:24:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):93 -> a
+    25:25:com.android.tools.r8.graph.DexApplication com.android.tools.r8.D8.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):251:251 -> a
+    25:25:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):93 -> a
+    26:46:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):95:115 -> a
+    47:52:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):110:115 -> a
+    53:55:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):121:123 -> a
+    56:56:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> a
+    56:56:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39 -> a
+    57:57:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39:39 -> a
+    58:58:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> a
+    58:58:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):40 -> a
+    59:76:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):40:57 -> a
+    77:88:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):44:55 -> a
 com.android.tools.r8.DexFilePerClassFileConsumer -> com.android.tools.r8.DexFilePerClassFileConsumer:
     1:1:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):62:62 -> accept
     2:2:void accept(java.lang.String,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):72:72 -> accept
@@ -707,8 +711,8 @@
     3:3:void <init>(java.nio.file.Path,com.android.tools.r8.DexIndexedConsumer):227:227 -> <init>
     4:4:void <init>(java.nio.file.Path,com.android.tools.r8.DexIndexedConsumer,boolean):232:232 -> <init>
     5:26:void <init>(java.nio.file.Path,com.android.tools.r8.DexIndexedConsumer,boolean):214:235 -> <init>
-    1:7:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> a
-    8:14:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> a
+    1:8:void deleteClassesDexFiles(java.nio.file.Path):280:280 -> a
+    14:14:void deleteClassesDexFiles(java.nio.file.Path):286:286 -> a
     15:15:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):286:286 -> a
     1:1:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):246:246 -> accept
     2:6:void prepareDirectory():272:276 -> accept
@@ -819,8 +823,8 @@
     1:3:java.util.Collection extractMarkerFromDexFile(java.nio.file.Path):48:50 -> extractMarkerFromDexFile
     1:2:java.util.Collection extractMarkerFromDexProgramData(byte[]):69:70 -> extractMarkerFromDexProgramData
     1:55:void main(java.lang.String[]):109:163 -> main
-    56:57:void main(java.lang.String[]):127:128 -> main
-    58:101:void main(java.lang.String[]):127:170 -> main
+    56:58:void main(java.lang.String[]):127:127 -> main
+    97:101:void main(java.lang.String[]):166:170 -> main
 com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.ExtractMarker$a:
     int index -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin,int):36:37 -> <init>
@@ -1001,8 +1005,7 @@
     8:8:void <init>(com.android.tools.r8.DiagnosticsHandler):46:46 -> <init>
     9:12:void <init>(com.android.tools.r8.DiagnosticsHandler):37:40 -> <init>
     1:2:void lambda$addMainDexRulesFiles$1(java.util.List):72:73 -> a
-    3:4:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):83:84 -> a
-    5:5:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):83:83 -> a
+    3:5:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):83:83 -> a
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):83:83 -> addMainDexRules
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder addMainDexRulesFiles(java.nio.file.Path[]):59:59 -> addMainDexRulesFiles
     2:2:com.android.tools.r8.GenerateMainDexListCommand$Builder addMainDexRulesFiles(java.util.List):71:71 -> addMainDexRulesFiles
@@ -1057,7 +1060,7 @@
     5:10:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):96:101 -> a
     11:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):107:137 -> a
     11:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):93 -> a
-    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():357:357 -> a
+    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():361:361 -> 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):93 -> a
     43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
@@ -1204,108 +1207,105 @@
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():140:140 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.utils.InternalOptions):146:152 -> <init>
-    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):185:185 -> a
+    1:1:void <clinit>():138:138 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.utils.InternalOptions):144:150 -> <init>
+    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:183 -> a
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    2:2:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):577 -> a
-    3:4:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):578:579 -> 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):199:200 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):201 -> 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):202:202 -> a
-    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():357:357 -> a
-    9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):204 -> a
-    10:23:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):204:217 -> a
-    24:25:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):223:224 -> a
-    26:27:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):230:231 -> a
+    2:2:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):571 -> a
+    3:4:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):572:573 -> a
+    5:6:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):197:198 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):199 -> a
+    8:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):200:200 -> a
+    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():361:361 -> a
+    9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):202 -> a
+    10:23:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):202:215 -> a
+    24:25:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):221:222 -> a
+    26:27:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):228:229 -> a
     28:28:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> a
-    28:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):231 -> a
-    29:55:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):248:274 -> a
-    56:86:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):273:303 -> a
-    87:91:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):302:306 -> a
-    92:92:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):305:305 -> a
-    93:104:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):304:315 -> a
-    105:107:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):314:316 -> a
-    108:129:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):310:331 -> a
-    130:154:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):330:354 -> a
-    155:155:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):351:351 -> a
-    156:207:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):347:398 -> a
-    208:230:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):397:419 -> a
-    231:255:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):416:440 -> a
-    256:275:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):437:456 -> a
-    276:290:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):453:467 -> a
-    291:300:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):464:473 -> a
-    301:313:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):470:482 -> a
-    314:322:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):480:488 -> a
-    323:373:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):485:535 -> a
-    374:378:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):531:535 -> a
-    379:463:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):529:613 -> a
-    464:464:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):611:611 -> a
-    465:483:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):610:628 -> a
-    484:500:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):626:642 -> a
-    501:501:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):639:639 -> a
-    502:517:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):636:651 -> a
-    518:573:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):650:705 -> a
-    574:669:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):704:799 -> a
-    670:699:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):745:774 -> a
-    700:700:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):770:770 -> a
-    701:721:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):768:788 -> a
-    722:738:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):783:799 -> a
-    739:739:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):671:671 -> a
-    740:740:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):514:514 -> a
-    741:1174:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):366:799 -> a
-    1175:1176:void lambda$run$2(com.android.tools.r8.graph.DexType):278:279 -> a
-    1177:1177:void lambda$run$2(com.android.tools.r8.graph.DexType):278:278 -> a
-    1178:1178:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):340:340 -> a
-    1179:1183:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):571:575 -> a
-    1184:1184:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$7(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):627:627 -> a
-    1185:1185:java.lang.Iterable lambda$run$8(com.android.tools.r8.graph.AppView):652:652 -> a
-    1186:1186:void lambda$run$9(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):683:683 -> a
-    1187:1187:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):691:691 -> a
-    1188:1188:void lambda$run$11(java.lang.String):739:739 -> a
-    1189:1189:void lambda$run$12(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):750:750 -> a
-    1190:1190:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):762:762 -> a
-    1191:1199:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):806:814 -> a
-    1200:1208:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):812:820 -> a
-    1209:1209:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):818:818 -> a
-    1210:1210:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):817:817 -> a
-    1211:1213:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):837:839 -> a
-    1214:1236:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):838:860 -> a
-    1237:1248:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):858:869 -> a
-    1249:1254:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):868:873 -> a
-    1255:1260:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):871:876 -> a
-    1261:1261:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1261:1261:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):876 -> a
-    1262:1262:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1262:1262:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1262:1262:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):876 -> a
-    1263:1263:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):876:876 -> a
-    1264:1272:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):880:888 -> a
-    1273:1276:boolean verifyNoJarApplicationReaders(java.util.List):893:896 -> a
-    1277:1277:void lambda$run$14(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):918:918 -> a
-    1278:1278:void lambda$main$15(java.lang.String[]):934:934 -> a
+    28:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):229 -> a
+    29:55:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):246:272 -> a
+    56:86:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):271:301 -> a
+    87:91:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):300:304 -> a
+    92:92:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303:303 -> a
+    93:104:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):302:313 -> a
+    105:107:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):312:314 -> a
+    108:130:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):308:330 -> a
+    131:153:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):329:351 -> a
+    154:154:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):348:348 -> a
+    155:206:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):344:395 -> a
+    207:229:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):394:416 -> a
+    230:254:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):413:437 -> a
+    255:274:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):434:453 -> a
+    275:289:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):450:464 -> a
+    290:299:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):461:470 -> a
+    300:312:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):467:479 -> a
+    313:321:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):477:485 -> a
+    322:447:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):482:607 -> a
+    448:448:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):605:605 -> a
+    449:467:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):604:622 -> a
+    468:484:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):620:636 -> a
+    485:485:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):633:633 -> a
+    486:501:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):630:645 -> a
+    502:557:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):644:699 -> a
+    558:652:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):698:792 -> a
+    653:682:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):738:767 -> a
+    683:683:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):763:763 -> a
+    684:704:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):761:781 -> a
+    705:721:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):776:792 -> a
+    722:722:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):665:665 -> a
+    723:723:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):508:508 -> a
+    724:1153:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):363:792 -> a
+    1154:1156:void lambda$run$2(com.android.tools.r8.graph.DexType):276:276 -> a
+    1157:1157:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):338:338 -> a
+    1158:1162:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):565:569 -> a
+    1163:1163:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$7(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):621:621 -> a
+    1164:1164:java.lang.Iterable lambda$run$8(com.android.tools.r8.graph.AppView):646:646 -> a
+    1165:1165:void lambda$run$9(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):677:677 -> a
+    1166:1166:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):685:685 -> a
+    1167:1167:void lambda$run$11(java.lang.String):732:732 -> a
+    1168:1168:void lambda$run$12(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):743:743 -> a
+    1169:1169:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):755:755 -> a
+    1170:1178:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):799:807 -> a
+    1179:1187:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):805:813 -> a
+    1188:1188:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):811:811 -> a
+    1189:1189:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):810:810 -> a
+    1190:1192:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):830:832 -> a
+    1193:1215:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):831:853 -> a
+    1216:1227:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):851:862 -> a
+    1228:1233:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):861:866 -> a
+    1234:1239:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):864:869 -> a
+    1240:1240:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1240:1240:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):869 -> a
+    1241:1241:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1241:1241:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1241:1241:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):869 -> a
+    1242:1242:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):869:869 -> a
+    1243:1251:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):873:881 -> a
+    1252:1255:boolean verifyNoJarApplicationReaders(java.util.List):886:889 -> a
+    1256:1256:void lambda$run$14(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):911:911 -> a
+    1257:1257:void lambda$main$15(java.lang.String[]):927:927 -> a
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> b
-    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):235:237 -> b
-    4:5:void run(java.lang.String[]):904:905 -> b
+    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):233:235 -> b
+    4:5:void run(java.lang.String[]):897:898 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):906 -> b
-    7:7:void run(java.lang.String[]):907:907 -> b
+    6:6:void run(java.lang.String[]):899 -> b
+    7:7:void run(java.lang.String[]):900:900 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
-    8:8:void run(java.lang.String[]):906 -> b
-    9:16:void run(java.lang.String[]):910:917 -> b
+    8:8:void run(java.lang.String[]):899 -> b
+    9:16:void run(java.lang.String[]):903:910 -> b
     17:17:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> b
-    17:17:void run(java.lang.String[]):917 -> b
-    18:18:void run(java.lang.String[]):920:920 -> b
-    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):244:244 -> c
-    1:5:void main(java.lang.String[]):930:934 -> main
-    1:3:void run(com.android.tools.r8.R8Command):164:166 -> run
-    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):180:183 -> run
+    17:17:void run(java.lang.String[]):910 -> b
+    18:18:void run(java.lang.String[]):913:913 -> b
+    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):242:242 -> c
+    1:5:void main(java.lang.String[]):923:927 -> main
+    1:3:void run(com.android.tools.r8.R8Command):162:164 -> run
+    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):178:181 -> run
     8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> run
-    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):182 -> run
+    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):180 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     java.lang.String USAGE_MESSAGE -> F
     java.util.List mainDexKeepRules -> p
@@ -1337,7 +1337,7 @@
     67:77:com.android.tools.r8.utils.InternalOptions getInternalOptions():848:858 -> a
     78:88:com.android.tools.r8.utils.InternalOptions getInternalOptions():855:865 -> a
     89:111:com.android.tools.r8.utils.InternalOptions getInternalOptions():862:884 -> a
-    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     112:112:com.android.tools.r8.utils.InternalOptions getInternalOptions():889 -> a
     113:127:com.android.tools.r8.utils.InternalOptions getInternalOptions():890:904 -> a
     128:130:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):913:915 -> a
@@ -1379,8 +1379,7 @@
     27:47:void <init>(com.android.tools.r8.utils.AndroidApp):87:107 -> <init>
     48:48:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):123:123 -> <init>
     49:69:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):87:107 -> <init>
-    1:2:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):190:191 -> a
-    3:3:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):190:190 -> a
+    1:3:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):190:190 -> a
     4:5:void lambda$addProguardConfigurationFiles$5(java.util.List):208:209 -> a
     6:6:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):394:394 -> a
     7:9:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):513:515 -> a
@@ -1400,8 +1399,7 @@
     1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):197:197 -> addProguardConfigurationFiles
     2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):207:207 -> addProguardConfigurationFiles
     1:1:java.lang.Boolean lambda$new$0(java.lang.String,java.lang.Long):102:102 -> b
-    2:3:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):217:218 -> b
-    4:4:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):217:217 -> b
+    2:4:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):217:217 -> b
     5:7:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):590:592 -> b
     1:1:com.android.tools.r8.BaseCommand makeCommand():66:66 -> c
     2:2:void setDisableVerticalClassMerging(boolean):133:133 -> c
@@ -1445,8 +1443,7 @@
     1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):484:484 -> <init>
     1:6:void visit(com.android.tools.r8.DataEntryResource):492:497 -> visit
     7:15:void visit(com.android.tools.r8.DataEntryResource):493:501 -> visit
-    16:17:void visit(com.android.tools.r8.DataEntryResource):498:499 -> visit
-    18:18:void visit(com.android.tools.r8.DataEntryResource):498:498 -> visit
+    16:18:void visit(com.android.tools.r8.DataEntryResource):498:498 -> visit
 com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> com.android.tools.r8.R8Command$Builder$c:
     1:1:void <init>():69:69 -> <init>
     2:2:void <init>(com.android.tools.r8.R8Command$1):69:69 -> <init>
@@ -1844,8 +1841,7 @@
     37:62:void visitMethod(java.lang.String,com.android.tools.r8.graph.CfCode):131:156 -> a
     63:73:void visitMethod(java.lang.String,com.android.tools.r8.graph.CfCode):151:161 -> a
     74:74:void visitMethod(java.lang.String,com.android.tools.r8.graph.CfCode):100:100 -> a
-    75:77:java.lang.String r8Type(java.lang.String,java.util.List):190:192 -> a
-    78:78:java.lang.String r8Type(java.lang.String,java.util.List):190:190 -> a
+    75:78:java.lang.String r8Type(java.lang.String,java.util.List):190:190 -> a
     79:79:java.lang.String numericType(com.android.tools.r8.ir.code.NumericType):212:212 -> a
     80:80:java.lang.String dexString(com.android.tools.r8.graph.DexString):224:224 -> a
     81:81:java.lang.String quote(java.lang.String):165:165 -> a
@@ -1859,8 +1855,7 @@
     91:91:java.lang.String ifTypeKind(com.android.tools.r8.ir.code.If$Type):220:220 -> a
     91:91:void printNewJumpInstruction(java.lang.String,com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):270 -> a
     92:92:void printNewJumpInstruction(java.lang.String,com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):270:270 -> a
-    93:95:void print(com.android.tools.r8.cf.code.CfStackInstruction):280:282 -> a
-    96:96:void print(com.android.tools.r8.cf.code.CfStackInstruction):280:280 -> a
+    93:96:void print(com.android.tools.r8.cf.code.CfStackInstruction):280:280 -> a
     97:97:void print(com.android.tools.r8.cf.code.CfThrow):287:287 -> a
     98:98:void print(com.android.tools.r8.cf.code.CfConstNull):292:292 -> a
     99:100:void print(com.android.tools.r8.cf.code.CfConstNumber):297:298 -> a
@@ -1872,15 +1867,11 @@
     105:105:void print(com.android.tools.r8.cf.code.CfReturnVoid):308:308 -> a
     106:106:void print(com.android.tools.r8.cf.code.CfReturn):313:313 -> a
     107:107:void print(com.android.tools.r8.cf.code.CfMonitor):318:318 -> a
-    108:111:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):323:326 -> a
-    112:112:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):323:323 -> a
-    113:114:void print(com.android.tools.r8.cf.code.CfCmp):331:332 -> a
-    115:115:void print(com.android.tools.r8.cf.code.CfCmp):331:331 -> a
-    116:119:void print(com.android.tools.r8.cf.code.CfLogicalBinop):337:340 -> a
-    120:120:void print(com.android.tools.r8.cf.code.CfLogicalBinop):337:337 -> a
+    108:112:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):323:323 -> a
+    113:115:void print(com.android.tools.r8.cf.code.CfCmp):331:331 -> a
+    116:120:void print(com.android.tools.r8.cf.code.CfLogicalBinop):337:337 -> a
     121:121:void print(com.android.tools.r8.cf.code.CfNeg):345:345 -> a
-    122:125:void print(com.android.tools.r8.cf.code.CfNumberConversion):350:353 -> a
-    126:126:void print(com.android.tools.r8.cf.code.CfNumberConversion):350:350 -> a
+    122:126:void print(com.android.tools.r8.cf.code.CfNumberConversion):350:350 -> a
     127:127:void print(com.android.tools.r8.cf.code.CfConstString):358:358 -> a
     128:128:void print(com.android.tools.r8.cf.code.CfDexItemBasedConstString):363:363 -> a
     129:129:void print(com.android.tools.r8.cf.code.CfArrayLoad):368:368 -> a
@@ -1912,8 +1903,7 @@
     165:165:void print(com.android.tools.r8.cf.code.CfSwitch):460:460 -> a
     166:166:void print(com.android.tools.r8.cf.code.CfLoad):465:465 -> a
     167:167:void print(com.android.tools.r8.cf.code.CfStore):470:470 -> a
-    168:171:void print(com.android.tools.r8.cf.code.CfIinc):475:478 -> a
-    172:172:void print(com.android.tools.r8.cf.code.CfIinc):475:475 -> a
+    168:172:void print(com.android.tools.r8.cf.code.CfIinc):475:475 -> a
     173:173:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):483:483 -> a
     174:174:void print(com.android.tools.r8.cf.code.CfConstMethodType):488:488 -> a
     1:3:java.lang.String type(java.lang.String,java.util.List):175:177 -> b
@@ -2251,8 +2241,8 @@
     55:55:boolean isConstInstructionAlwaysThreeBytes(com.android.tools.r8.ir.code.ConstInstruction):84:84 -> b
     55:55:boolean canRemoveConstInstruction(com.android.tools.r8.ir.code.ConstInstruction,com.android.tools.r8.ir.code.BasicBlock):95 -> b
     55:55:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):177 -> b
-    56:57:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):178:179 -> b
-    58:68:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):178:188 -> b
+    56:58:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):178:178 -> b
+    60:68:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):180:188 -> b
     69:69:com.android.tools.r8.ir.code.StackValue createStackValue(com.android.tools.r8.ir.code.Value,int):143:143 -> b
     69:69:void popOutValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):218 -> b
     69:69:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):188 -> b
@@ -2510,8 +2500,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):33:33 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):38:38 -> a
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):43:43 -> a
-    4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:55 -> a
-    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:54 -> a
+    4:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:54 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():333:333 -> 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):62 -> a
     boolean canThrow() -> e
@@ -2522,8 +2511,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):33:33 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):38:38 -> a
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):43:43 -> a
-    4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:55 -> a
-    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:54 -> a
+    4:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:54 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():337:337 -> 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):62 -> a
     boolean canThrow() -> e
@@ -2533,8 +2521,10 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):22:22 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):27:27 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):32:32 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():107:107 -> 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):39 -> a
+    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1091:1091 -> a
+    4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):32 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():107:107 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):39 -> a
 com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.q.n.k:
     com.android.tools.r8.ir.code.ValueType type -> b
     long value -> a
@@ -2584,8 +2574,7 @@
     1:1:void setString(com.android.tools.r8.graph.DexString):30:30 -> a
     2:2:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):45:45 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):50:50 -> a
-    4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):61:62 -> a
-    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):61:61 -> a
+    4:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):61:61 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():107:107 -> 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):69 -> a
     boolean canThrow() -> e
@@ -2600,8 +2589,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):50:50 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):56:56 -> a
     3:5:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):67:69 -> a
-    6:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):75:76 -> a
-    8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):75:75 -> a
+    6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):75:75 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType):95:95 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> b
@@ -2748,9 +2736,9 @@
     18:18:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):72:72 -> a
     19:19:void print(com.android.tools.r8.cf.CfPrinter):67:67 -> 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):87:91 -> 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):1298:1298 -> 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):1296:1296 -> 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):91 -> 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):1296:1298 -> 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):1294:1296 -> 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):91 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():261:261 -> 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):98 -> a
@@ -2892,7 +2880,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):59:59 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):64:64 -> 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):77:79 -> a
-    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):79 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():265:265 -> 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):91 -> a
@@ -3019,10 +3007,10 @@
     1:1:com.android.tools.r8.graph.DexType getType():31:31 -> q
 com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.q.n.K:
     1:1:void <init>():17:17 -> <init>
-    void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):21:21 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):26:26 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):43:43 -> a
+    3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):31:31 -> 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):43:43 -> a
     boolean emitsIR() -> f
 com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.q.n.L:
     com.android.tools.r8.ir.code.NumericType to -> b
@@ -3115,35 +3103,35 @@
     158:173:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):181:196 -> a
     174:183: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):288:297 -> a
     174:183:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):201 -> a
-    184:184:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    184:184:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> a
     184: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):297 -> a
     184:184:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):201 -> 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: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):201 -> a
-    186:186:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    186:186:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):299 -> 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):201 -> 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: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):201 -> a
-    188:188:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    188:188:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):301 -> 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):201 -> 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: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):201 -> a
-    190:190:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    190:190:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):303 -> 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):201 -> 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: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):201 -> a
-    192:192:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    192:192:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):305 -> 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):201 -> 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: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):201 -> a
-    194:194:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    194:194:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):307 -> 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):201 -> a
-    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):297 -> 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):201 -> 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):197:197 -> a
@@ -3156,65 +3144,65 @@
     201:201:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):189:189 -> a
     202:210:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):152:160 -> a
     211:213:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):140:142 -> a
-    214:214:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    214:214:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> a
     214:214:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):142 -> a
     215:216:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144:145 -> a
-    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):145 -> a
     218:218:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:146 -> a
-    219:219:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    219:219:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> a
     219:219:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146 -> a
-    220:220:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    220:220:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):145 -> a
     221:229:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):126:134 -> a
     230:234:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):117:121 -> a
     235:237:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):110:112 -> a
-    238:238:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    238:238:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> a
     238:238:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112 -> a
     239:242:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):101:104 -> a
     243:244:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):95:96 -> a
     245:250: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):224:229 -> a
-    251:251:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    251:251:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> a
     251:251: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):229 -> a
     252:252: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:231 -> a
-    253:253:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    253:253:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> a
     253: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):231 -> 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):233:233 -> a
-    255:255:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    255:255:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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 -> a
-    256:256:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    256:256:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):229 -> a
     257:263: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):241:247 -> a
-    264:264:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    264:264:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> a
     264:264: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):247 -> a
     265:265: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:249 -> a
-    266:266:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    266:266:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> a
     266: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):249 -> 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):251:251 -> a
-    268:268:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    268:268:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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 -> 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):253:253 -> a
-    270:270:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    270:270:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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 -> a
-    271:271:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    271:271:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):247 -> a
     272:272:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):319:319 -> a
     1:8:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):260:267 -> b
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> b
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):267 -> 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):269:269 -> b
-    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> b
+    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):269 -> 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):271:271 -> b
-    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> b
+    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):271 -> 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):273:273 -> b
-    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> b
+    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):273 -> 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):275:275 -> b
-    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> b
+    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):275 -> b
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> b
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):267 -> b
     boolean emitsIR() -> f
     1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():87:87 -> q
@@ -3243,7 +3231,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):59:59 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):64:64 -> 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):77:78 -> a
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> a
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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):78 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():317:317 -> 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):90 -> a
@@ -3746,11 +3734,9 @@
     1:2:void com.android.tools.r8.code.Format31i.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):33:34 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     3:3:int decodedValue():43:43 -> a
-    4:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
-    6:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
+    4:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     7:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:63 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
@@ -3766,8 +3752,7 @@
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     5:5:int decodedValue():43:43 -> a
     6:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:57 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
@@ -3778,11 +3763,9 @@
     1:1:void com.android.tools.r8.code.Format11n.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):39:39 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     2:2:int decodedValue():43:43 -> a
-    3:4:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
-    5:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
+    3:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     6:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:63 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
@@ -3814,11 +3797,9 @@
     3:3:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):34 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     4:4:int decodedValue():43:43 -> a
-    5:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
-    7:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
+    5:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     8:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:63 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
@@ -3924,11 +3905,9 @@
     3:4:void com.android.tools.r8.code.Format51l.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):34 -> a
     3:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     5:5:long decodedValue():43:43 -> a
-    6:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
-    8:8:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
+    6:8:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     1:5:boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object):44:48 -> equals
     1:5:boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object):0 -> equals
     1:1:int com.android.tools.r8.code.Format51l.hashCode():39:39 -> hashCode
@@ -3946,11 +3925,9 @@
     3:3:void com.android.tools.r8.code.Format21s.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):36 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     4:4:long decodedValue():43:43 -> a
-    5:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
-    7:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
+    5:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
@@ -3961,11 +3938,9 @@
     1:2:void com.android.tools.r8.code.Format31i.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):33:34 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     3:3:long decodedValue():43:43 -> a
-    4:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
-    6:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
+    4:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
@@ -3979,11 +3954,9 @@
     3:3:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):34 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     4:4:long decodedValue():43:43 -> a
-    5:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
-    7:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
+    5:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
@@ -4303,8 +4276,7 @@
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):35:36 -> a
     3:3:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):62:62 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):55:56 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):55:55 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):55:55 -> b
     1:5:boolean equals(java.lang.Object):46:50 -> equals
     1:1:int hashCode():41:41 -> hashCode
 com.android.tools.r8.code.Format21h -> com.android.tools.r8.code.G0:
@@ -4362,8 +4334,7 @@
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):39:40 -> a
     3:3:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):93:93 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):40 -> a
-    4:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):64:65 -> a
-    6:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):64:64 -> a
+    4:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):64:64 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:59 -> b
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():45:45 -> hashCode
@@ -4378,8 +4349,7 @@
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):39:40 -> a
     3:3:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):66:66 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):72:72 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:60 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:59 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:59 -> b
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():45:45 -> hashCode
 com.android.tools.r8.code.Format22s -> com.android.tools.r8.code.L0:
@@ -4394,8 +4364,7 @@
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):39:40 -> a
     3:3:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):93:93 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):40 -> a
-    4:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):64:65 -> a
-    6:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):64:64 -> a
+    4:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):64:64 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:59 -> b
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():45:45 -> hashCode
@@ -4471,8 +4440,7 @@
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):64:64 -> a
     5:5:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):245:245 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):64 -> a
-    1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):57:58 -> b
-    3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):57:57 -> b
+    1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):57:57 -> b
     1:5:boolean equals(java.lang.Object):48:52 -> equals
     1:1:int hashCode():43:43 -> hashCode
 com.android.tools.r8.code.Format31i -> com.android.tools.r8.code.R0:
@@ -4857,7 +4825,7 @@
     int getPayloadOffset() -> l
     int getSize() -> m
     java.lang.String getSmaliName() -> n
-    1:1:int[] getTargets():224:224 -> o
+    int[] getTargets() -> o
     boolean hasPayload() -> p
     boolean isCheckCast() -> q
     boolean isConstClass() -> r
@@ -5631,7 +5599,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[]):1432:1448 -> a
+    3:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1430:1446 -> 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
@@ -5677,8 +5645,7 @@
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):20:20 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):24:24 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):44:44 -> a
-    2:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:55 -> a
-    4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:54 -> a
+    2:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:54 -> a
     boolean canThrow() -> f
     1:1:com.android.tools.r8.graph.DexMethod getMethod():49:49 -> h
     java.lang.String getName() -> i
@@ -6038,7 +6005,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):1202:1202 -> a
+    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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() -> i
@@ -6051,7 +6018,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):1202:1202 -> a
+    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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() -> i
@@ -6068,7 +6035,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):1202:1202 -> a
+    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1186:1186 -> 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() -> i
@@ -7480,10 +7447,8 @@
     11:11:java.util.List com.android.tools.r8.com.google.common.base.Predicates.asList(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):722:722 -> a
     11:11:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
     12:12:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
-    13:13:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    13:13:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
-    14:14:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    14:14:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
+    13:14:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    13:14:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
     15:15:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,char):170:170 -> a
     16:16:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):181:181 -> a
     17:17:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):192:192 -> a
@@ -7768,8 +7733,7 @@
     2:2:java.util.Collection get(java.lang.Object):306 -> get
     3:3:java.util.Collection get(java.lang.Object):308:308 -> get
     1:1:java.util.Iterator entryIterator():1253:1253 -> h
-    1:10:java.util.Spliterator entrySpliterator():1263:1272 -> i
-    11:11:java.util.Spliterator entrySpliterator():1263:1263 -> i
+    1:11:java.util.Spliterator entrySpliterator():1263:1263 -> i
     java.util.Collection createCollection() -> j
     1:1:boolean put(java.lang.Object,java.lang.Object):192:192 -> put
     2:2:java.util.Collection createCollection(java.lang.Object):169:169 -> put
@@ -8705,10 +8669,8 @@
     105:105:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry seekByKey(java.lang.Object,int):224:224 -> a
     106:106:java.lang.Object forcePut(java.lang.Object,java.lang.Object):268:268 -> a
     107:136:java.lang.Object put(java.lang.Object,java.lang.Object,boolean):272:301 -> a
-    137:166:java.lang.Object putInverse(java.lang.Object,java.lang.Object,boolean):308:337 -> a
-    137:166:java.lang.Object access$800(com.android.tools.r8.com.google.common.collect.HashBiMap,java.lang.Object,java.lang.Object,boolean):58 -> a
-    167:167:java.lang.Object putInverse(java.lang.Object,java.lang.Object,boolean):308:308 -> a
-    167:167:java.lang.Object access$800(com.android.tools.r8.com.google.common.collect.HashBiMap,java.lang.Object,java.lang.Object,boolean):58 -> a
+    137:167:java.lang.Object putInverse(java.lang.Object,java.lang.Object,boolean):308:308 -> a
+    137:167:java.lang.Object access$800(com.android.tools.r8.com.google.common.collect.HashBiMap,java.lang.Object,java.lang.Object,boolean):58 -> a
     1:1:int access$100(com.android.tools.r8.com.google.common.collect.HashBiMap):58:58 -> b
     2:2:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry access$400(com.android.tools.r8.com.google.common.collect.HashBiMap,java.lang.Object,int):58:58 -> b
     3:6:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry seekByValue(java.lang.Object,int):233:236 -> b
@@ -9074,10 +9036,10 @@
     15:15:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):442 -> b
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):444:444 -> b
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):393:393 -> c
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):454:454 -> c
     1:1:boolean contains(java.lang.Object):422:422 -> contains
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator():388:388 -> d
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():383 -> d
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):454:454 -> d
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder builder():711:711 -> e
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():739:739 -> e
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder builder():711 -> e
@@ -9616,14 +9578,14 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> i
 com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.r.a.a.b.w0:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList):34:34 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.subListUnchecked(int,int):454:454 -> c
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):83 -> c
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):84:84 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet delegateCollection():39:39 -> comparator
     1:1:java.util.Comparator comparator():44 -> comparator
     2:2:java.util.Comparator com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.comparator():577:577 -> comparator
     2:2:java.util.Comparator comparator():44 -> comparator
     1:1:boolean contains(java.lang.Object):72:72 -> contains
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.subListUnchecked(int,int):454:454 -> d
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):83 -> d
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):84:84 -> d
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet delegateCollection():39:39 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():29 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet delegateCollection():39:39 -> indexOf
@@ -9665,10 +9627,8 @@
     48:48:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList):580:580 -> a
     48:48:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.util.Map$Entry[],int):412 -> a
     48:48:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap access$100(java.util.Comparator,boolean,java.util.Map$Entry[],int):63 -> a
-    49:50:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.util.Map$Entry[],int):374:375 -> a
-    49:50:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap access$100(java.util.Comparator,boolean,java.util.Map$Entry[],int):63 -> a
-    51:51:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.util.Map$Entry[],int):374:374 -> a
-    51:51:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap access$100(java.util.Comparator,boolean,java.util.Map$Entry[],int):63 -> a
+    49:51:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.util.Map$Entry[],int):374:374 -> a
+    49:51:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap access$100(java.util.Comparator,boolean,java.util.Map$Entry[],int):63 -> a
     52:52:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.util.Map$Entry[],int):372:372 -> a
     52:52:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap access$100(java.util.Comparator,boolean,java.util.Map$Entry[],int):63 -> a
     53:53:int size():594:594 -> a
@@ -11503,8 +11463,7 @@
     1:1:java.lang.Object pollLast():1887:1887 -> pollLast
     1:1:boolean removeIf(java.util.function.Predicate):1842:1842 -> removeIf
     1:1:java.util.stream.Stream stream():1847:1847 -> stream
-    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:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
 com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.r.a.a.b.D2:
     java.lang.Object singleValue -> f
@@ -11834,7 +11793,6 @@
     7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     7:7:long copy(java.io.InputStream,java.io.OutputStream):101 -> a
     8:10:byte[] toByteArray(java.io.InputStream):165:167 -> a
-    11:11:java.io.OutputStream nullOutputStream():624:624 -> a
 com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.r.a.a.d.f:
     1:1:void <init>():595:595 -> <init>
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
@@ -12419,10 +12377,8 @@
     34:108:int nextNonWhitespace(boolean):1319:1393 -> a
     109:151:int nextNonWhitespace(boolean):1328:1370 -> a
     152:152:int nextNonWhitespace(boolean):1357:1357 -> a
-    153:160:boolean skipTo(java.lang.String):1428:1435 -> a
-    153:160:int nextNonWhitespace(boolean):1358 -> a
-    161:161:boolean skipTo(java.lang.String):1428:1428 -> a
-    161:161:int nextNonWhitespace(boolean):1358 -> a
+    153:161:boolean skipTo(java.lang.String):1428:1428 -> a
+    153:161:int nextNonWhitespace(boolean):1358 -> a
     162:163:int nextNonWhitespace(boolean):1361:1362 -> a
     164:193:int nextNonWhitespace(boolean):1359:1388 -> a
     194:194:java.io.IOException syntaxError(java.lang.String):1559:1559 -> a
@@ -12791,65 +12747,62 @@
     1:1:com.android.tools.r8.utils.InternalOptions access$000(com.android.tools.r8.dex.ApplicationReader):60:60 -> a
     2:2:com.android.tools.r8.graph.DexApplication read():79:79 -> a
     3:7:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource):83:87 -> a
-    8:9:com.android.tools.r8.graph.DexApplication read(java.util.concurrent.ExecutorService):93:94 -> a
-    10:10:com.android.tools.r8.graph.DexApplication read(java.util.concurrent.ExecutorService):93:93 -> a
-    11:14:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):99:102 -> a
-    15:15:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):99:99 -> a
+    8:10:com.android.tools.r8.graph.DexApplication read(java.util.concurrent.ExecutorService):93:93 -> a
+    11:15:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):99:99 -> a
     16:16:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):110:110 -> a
     17:26:boolean verifyMainDexOptionsCompatible(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):176:185 -> a
     17:26:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):110 -> a
     27:38:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):113:124 -> a
     39:39:void dumpInputToFile(com.android.tools.r8.utils.AndroidApp,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):171:171 -> a
     39:39:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):124 -> a
-    40:47:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):126:133 -> a
-    48:48:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):131:131 -> a
-    49:51:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    49:51:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):131 -> a
-    52:83:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):136:167 -> a
-    84:84:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):163:163 -> a
-    85:87:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    85:87:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):163 -> a
-    88:92:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):161:165 -> a
-    93:94:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):190:191 -> a
-    93:94:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    95:105:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):79:89 -> a
-    95:105:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
-    95:105:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    106:106:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):87:87 -> a
+    40:45:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):128:133 -> a
+    46:46:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):131:131 -> a
+    47:49:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
+    47:49:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):131 -> a
+    50:81:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):136:167 -> a
+    82:82:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):163:163 -> a
+    83:85:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
+    83:85:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):163 -> a
+    86:90:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):161:165 -> a
+    91:92:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):190:191 -> a
+    91:92:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
+    93:103:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):79:89 -> a
+    93:103:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
+    93:103:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
+    104:104:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):87:87 -> a
+    104:104:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
+    104:104:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
+    105:105:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):85:85 -> a
+    105:105:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
+    105:105:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
+    106:106:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):83:83 -> a
     106:106:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
     106:106:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    107:107:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):85:85 -> a
+    107:107:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):81:81 -> a
     107:107:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
     107:107:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    108:108:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):83:83 -> a
-    108:108:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
-    108:108:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    109:109:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):81:81 -> a
-    109:109:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
-    109:109:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    110:113:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193:196 -> a
-    110:113:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    114:114:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    114:114:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):196 -> a
+    108:111:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193:196 -> a
+    108:111:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
+    112:112:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    112:112:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):196 -> a
+    112:112:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
+    113:113:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    113:113:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    113:113:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):196 -> a
+    113:113:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
+    114:114:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):196:196 -> a
     114:114:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    115:115:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    115:115:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    115:115:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):196 -> a
+    115:115:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):190:190 -> a
     115:115:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    116:116:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):196:196 -> a
-    116:116:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    117:117:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):190:190 -> a
-    117:117:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    118:119:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):211:212 -> a
-    120:120:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):211:211 -> a
-    121:124:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):215:218 -> a
-    125:125:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    125:125:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):218 -> a
-    126:126:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):218:218 -> a
-    127:128:void readMainDexList(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):225:226 -> a
-    129:137:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):227:235 -> a
-    138:138:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):231:231 -> a
-    139:139:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):234:234 -> a
+    116:118:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):211:211 -> a
+    119:122:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):215:218 -> a
+    123:123:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    123:123:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):218 -> a
+    124:124:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):218:218 -> a
+    125:126:void readMainDexList(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):225:226 -> a
+    127:135:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):227:235 -> a
+    136:136:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):231:231 -> a
+    137:137:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):234:234 -> a
     1:1:com.android.tools.r8.utils.AndroidApp access$200(com.android.tools.r8.dex.ApplicationReader):60:60 -> b
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.dex.a$a:
     java.util.List futures -> b
@@ -12863,12 +12816,11 @@
     1:1:void <clinit>():240:240 -> <clinit>
     1:1:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):252:252 -> <init>
     2:10:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):246:254 -> <init>
-    1:2:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,com.android.tools.r8.graph.ClassKind,java.util.Queue):279:280 -> a
-    3:3:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,com.android.tools.r8.graph.ClassKind,java.util.Queue):279:279 -> a
+    1:3:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,com.android.tools.r8.graph.ClassKind,java.util.Queue):279:279 -> a
     4:9:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):289:294 -> a
     10:10:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):293:293 -> a
-    11:13:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.graph.ClassKind):296:298 -> a
-    14:16:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.graph.ClassKind):296:298 -> a
+    11:14:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.graph.ClassKind):296:296 -> a
+    16:16:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.graph.ClassKind):298:298 -> a
     17:29:com.android.tools.r8.graph.JarClassFileReader readSources():309:321 -> a
     30:47:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):327:344 -> a
     48:54:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):349:355 -> a
@@ -12893,25 +12845,25 @@
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):146:146 -> <init>
     2:13:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):165:176 -> <init>
     1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183:183 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():341:341 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():345:345 -> a
     2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183 -> a
     3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):184:184 -> a
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():353:353 -> a
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():357:357 -> a
     4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):185 -> a
     5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):185:195 -> a
     16:17:void encodeChecksums(java.lang.Iterable):206:207 -> a
     18:18:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.<init>(int):110:110 -> a
     18:18:void encodeChecksums(java.lang.Iterable):207 -> a
     19:19:void encodeChecksums(java.lang.Iterable):208:208 -> a
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
     20:20:void encodeChecksums(java.lang.Iterable):209 -> a
     21:29:void encodeChecksums(java.lang.Iterable):209:217 -> a
     30:30:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):255:255 -> a
     31:35:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):266:270 -> a
-    36:36:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():353:353 -> a
+    36:36:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():357:357 -> a
     36:36:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):270 -> a
     37:44:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):273:280 -> a
-    45:45:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():349:349 -> a
+    45:45:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():353:353 -> a
     45:45:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):280 -> a
     46:49:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):284:287 -> a
     50:50:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):286:286 -> a
@@ -12970,7 +12922,7 @@
     1:31:void write(java.util.concurrent.ExecutorService):222:252 -> b
     32:44:void write(java.util.concurrent.ExecutorService):250:262 -> b
     45:102:void write(java.util.concurrent.ExecutorService):261:318 -> b
-    103:103:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> b
+    103:103:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> b
     103:103:void write(java.util.concurrent.ExecutorService):318 -> b
     104:116:void write(java.util.concurrent.ExecutorService):318:330 -> b
     117:125:void write(java.util.concurrent.ExecutorService):324:332 -> b
@@ -13041,7 +12993,7 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):23:24 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):25 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26:28 -> a
     void recordClassAllAccesses(com.android.tools.r8.graph.DexType) -> b
@@ -13050,37 +13002,38 @@
     java.util.Map toKeep -> c
     com.android.tools.r8.naming.NamingLens namingLens -> a
     com.android.tools.r8.utils.InternalOptions options -> d
-    java.util.Set emulatedInterfaces -> b
-    1:1:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):56:56 -> <init>
-    2:8:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):52:58 -> <init>
-    9:12:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):57:60 -> <init>
+    java.util.Set potentialTypesToKeep -> b
+    1:1:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):57:57 -> <init>
+    2:10:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):53:61 -> <init>
+    11:14:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):60:63 -> <init>
+    15:15:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):62:62 -> <init>
     boolean isNop() -> a
-    1:10:void recordMethod(com.android.tools.r8.graph.DexMethod):69:78 -> a
-    11:16:void recordField(com.android.tools.r8.graph.DexField):85:90 -> a
-    17:18:void recordClass(com.android.tools.r8.graph.DexType):96:97 -> a
-    19:58:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):128:167 -> a
-    1:3:void recordClassAllAccesses(com.android.tools.r8.graph.DexType):103:105 -> b
-    1:3:java.lang.String convertType(com.android.tools.r8.graph.DexType):120:122 -> c
-    1:1:void keepClass(com.android.tools.r8.graph.DexType):110:110 -> d
+    1:10:void recordMethod(com.android.tools.r8.graph.DexMethod):72:81 -> a
+    11:16:void recordField(com.android.tools.r8.graph.DexField):88:93 -> a
+    17:18:void recordClass(com.android.tools.r8.graph.DexType):99:100 -> a
+    19:58:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):131:170 -> a
+    1:3:void recordClassAllAccesses(com.android.tools.r8.graph.DexType):106:108 -> b
+    1:3:java.lang.String convertType(com.android.tools.r8.graph.DexType):123:125 -> c
+    1:1:void keepClass(com.android.tools.r8.graph.DexType):113:113 -> d
     2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):344:351 -> d
-    2:9:void keepClass(com.android.tools.r8.graph.DexType):110 -> d
+    2:9:void keepClass(com.android.tools.r8.graph.DexType):113 -> d
     10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):349:353 -> d
-    10:14:void keepClass(com.android.tools.r8.graph.DexType):110 -> d
-    15:15:void keepClass(com.android.tools.r8.graph.DexType):111:111 -> d
-    1:1:boolean shouldKeep(com.android.tools.r8.graph.DexType):64:64 -> e
+    10:14:void keepClass(com.android.tools.r8.graph.DexType):113 -> d
+    15:15:void keepClass(com.android.tools.r8.graph.DexType):114:114 -> d
+    1:1:boolean shouldKeep(com.android.tools.r8.graph.DexType):67:67 -> e
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$KeepStruct -> com.android.tools.r8.dex.f:
     java.util.Set fields -> a
     java.util.Set methods -> b
     boolean all -> c
-    1:4:void <init>():45:48 -> <init>
-    5:5:void <init>(com.android.tools.r8.dex.CodeToKeep$1):45:45 -> <init>
+    1:5:void <init>():45:49 -> <init>
+    6:6:void <init>(com.android.tools.r8.dex.CodeToKeep$1):45:45 -> <init>
 com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.dex.h:
-    1:1:void <init>():171:171 -> <init>
+    1:1:void <init>():174:174 -> <init>
     boolean isNop() -> a
     void recordClass(com.android.tools.r8.graph.DexType) -> a
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):192:192 -> a
+    1:1:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):195:195 -> a
     void recordClassAllAccesses(com.android.tools.r8.graph.DexType) -> b
 com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.dex.j:
     java.nio.ByteBuffer buffer -> a
@@ -13380,7 +13333,7 @@
     157:157:void ensureCodesInited(int):161 -> a
     157:157:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):642 -> a
     158:172:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):643:657 -> a
-    173:173:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    173:173:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     173:173:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):657 -> a
     174:177:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):658:661 -> a
     178:178:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13412,8 +13365,8 @@
     254:254:void addClassDefsTo(java.util.function.Consumer):732:732 -> a
     255:255:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
     255:255:void addClassDefsTo(java.util.function.Consumer):732 -> a
-    256:257:void addClassDefsTo(java.util.function.Consumer):734:735 -> a
-    258:268:void addClassDefsTo(java.util.function.Consumer):734:744 -> a
+    256:258:void addClassDefsTo(java.util.function.Consumer):734:734 -> a
+    260:268:void addClassDefsTo(java.util.function.Consumer):736:744 -> a
     269:283:void addClassDefsTo(java.util.function.Consumer):738:752 -> a
     284:284:void addClassDefsTo(java.util.function.Consumer):746:746 -> a
     285:285:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -14257,7 +14210,7 @@
     100:100:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):447 -> a
     101:104:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):450:453 -> a
     105:105:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):442:442 -> a
-    106:106:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    106:106:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> a
     106:106:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443 -> a
     107:107:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443:443 -> a
     108:108:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -14303,7 +14256,7 @@
     107:107:void markDexFull(com.android.tools.r8.dex.VirtualFile):716:716 -> b
     107:107:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643 -> b
     108:108:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):637:637 -> b
-    109:109:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> b
+    109:109:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> b
     109:109:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638 -> b
     110:110:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638:638 -> b
     111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
@@ -14343,10 +14296,10 @@
     9:19:void <init>(com.android.tools.r8.dex.InheritanceClassInDexDistributor,java.util.Set):57:67 -> <init>
     1:7:void updateNumbersOfIds():72:78 -> a
     1:1:int compareTo(java.lang.Object):54:54 -> compareTo
-    2:4:int compareTo(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):89:91 -> compareTo
-    2:4:int compareTo(java.lang.Object):54 -> compareTo
-    5:25:int compareTo(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):89:109 -> compareTo
-    5:25:int compareTo(java.lang.Object):54 -> compareTo
+    2:5:int compareTo(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):89:89 -> compareTo
+    2:5:int compareTo(java.lang.Object):54 -> compareTo
+    12:25:int compareTo(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):96:109 -> compareTo
+    12:25:int compareTo(java.lang.Object):54 -> compareTo
     26:29:int compareTo(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):107:110 -> compareTo
     26:29:int compareTo(java.lang.Object):54 -> compareTo
 com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -> com.android.tools.r8.dex.y:
@@ -14538,14 +14491,12 @@
     8:14:java.lang.String adaptFileName(com.android.tools.r8.DataEntryResource):102:108 -> a
     8:14:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):59 -> a
     15:23:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):60:68 -> a
-    24:32:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):122:130 -> a
-    24:32:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
-    33:45:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):122:134 -> a
-    33:45:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
-    46:47:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):131:132 -> a
-    46:47:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
-    48:48:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):131:131 -> a
-    48:48:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
+    24:33:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):122:122 -> a
+    24:33:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
+    41:45:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):130:134 -> a
+    41:45:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
+    46:48:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):131:131 -> a
+    46:48:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
     49:53:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):76:80 -> a
     54:56:com.android.tools.r8.DataDirectoryResource adaptIfNeeded(com.android.tools.r8.DataDirectoryResource):88:90 -> a
     57:61:java.lang.String adaptDirectoryName(com.android.tools.r8.DataDirectoryResource):112:116 -> a
@@ -14654,12 +14605,9 @@
     64:64:boolean run():172 -> d
     65:67:void handleJavaType():253:255 -> d
     65:67:boolean run():172 -> d
-    68:69:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.popInt():492:493 -> d
-    68:69:void handleJavaType():255 -> d
-    68:69:boolean run():172 -> d
-    70:70:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.popInt():492:492 -> d
-    70:70:void handleJavaType():255 -> d
-    70:70:boolean run():172 -> d
+    68:70:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.popInt():492:492 -> d
+    68:70:void handleJavaType():255 -> d
+    68:70:boolean run():172 -> d
     71:71:boolean eof():331:331 -> d
     71:71:boolean run():173 -> d
     72:82:boolean run():174:184 -> d
@@ -14738,8 +14686,7 @@
     25:25:void injectString(com.android.tools.r8.graph.DexString):146:146 -> a
     26:26:void commitTransaction():230:230 -> a
     26:26:void injectString(com.android.tools.r8.graph.DexString):147 -> a
-    27:28:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):155:156 -> a
-    29:29:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):155:155 -> a
+    27:29:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):155:155 -> a
     30:35:java.lang.String extractPrefixToken(int,java.lang.String,boolean):167:172 -> a
     30:35:java.lang.String access$1300(int,java.lang.String,boolean):51 -> a
     36:46:com.android.tools.r8.graph.ObjectToOffsetMapping computeMapping(com.android.tools.r8.graph.DexApplication):178:188 -> a
@@ -15304,8 +15251,7 @@
     1:8:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.naming.ClassNameMapper):54:61 -> a
     9:9:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):61:61 -> a
     10:25:java.util.Collection getDataResourceProvidersAndConsumers():87:102 -> a
-    26:27:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):111:112 -> a
-    28:28:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):111:111 -> a
+    26:28:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):111:111 -> a
     29:29:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116:116 -> a
     30:36:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):120:126 -> a
     30:36:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
@@ -15323,7 +15269,7 @@
 com.android.tools.r8.graph.AccessControl -> com.android.tools.r8.graph.a:
     1:1:boolean isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):42 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
     2:2:boolean isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):18 -> a
     2:2:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):42 -> a
     3:3:boolean isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):18:18 -> a
@@ -15331,15 +15277,11 @@
     4:7:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):45:48 -> a
     8:11:boolean isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):64:67 -> a
     8:11:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):49 -> a
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    12:12:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):51 -> a
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    13:13:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):51 -> a
+    12:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
+    12:13:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):51 -> a
     14:17:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):51:54 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    18:18:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    19:19:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
+    18:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
+    18:19:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     20:20:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57:57 -> a
     21:21:boolean isMethodAccessible(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):26:26 -> a
     22:22:boolean isFieldAccessible(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):34:34 -> a
@@ -15352,55 +15294,54 @@
     1:14:void <clinit>():16:29 -> <clinit>
     1:1:void <init>(int,int):57:57 -> <init>
     2:43:void <init>(int,int):18:59 -> <init>
-    1:7:int visibilityOrdinal():136:142 -> A
+    1:1:void unsetSynthetic():225:225 -> A
+    1:7:int visibilityOrdinal():136:142 -> B
     1:5:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):114:118 -> a
     6:6:boolean isVisibilityDependingOnPackage():150:150 -> a
     6:6:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):119 -> a
     7:7:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):120:120 -> a
     8:8:boolean isAtLeastAsVisibleAs(com.android.tools.r8.graph.AccessFlags):127:127 -> a
-    9:9:boolean isSet(int):254:254 -> a
-    10:10:void demote(int):276:276 -> a
-    10:10:void demoteFromFinal():233 -> a
-    11:24:java.lang.String toStringInternal(boolean):289:302 -> a
-    1:1:java.util.List getNames():51:51 -> b
-    2:2:boolean isSameVisibility(com.android.tools.r8.graph.AccessFlags):131:131 -> b
-    3:3:void promote(int):272:272 -> b
-    1:1:int getOriginalAccessFlags():95:95 -> c
-    2:3:void set(int):258:259 -> c
-    1:1:java.util.List getPredicates():40:40 -> d
-    2:3:void unset(int):263:264 -> d
-    1:1:boolean isFinal():205:205 -> e
+    9:9:void demoteFromFinal():237:237 -> a
+    10:10:void demote(int):280:280 -> a
+    11:24:java.lang.String toStringInternal(boolean):293:306 -> a
+    1:1:boolean isSameVisibility(com.android.tools.r8.graph.AccessFlags):131:131 -> b
+    2:2:void demoteFromSynthetic():229:229 -> b
+    3:3:boolean isSet(int):258:258 -> b
+    1:1:java.util.List getNames():51:51 -> c
+    2:2:void promote(int):276:276 -> c
+    1:1:int getOriginalAccessFlags():95:95 -> d
+    2:3:void set(int):262:263 -> d
+    1:1:java.util.List getPredicates():40:40 -> e
+    2:3:void unset(int):267:268 -> e
     1:3:boolean equals(java.lang.Object):100:102 -> equals
-    1:1:boolean isPrivate():167:167 -> f
-    1:1:boolean wasSet(int):250:250 -> g
-    1:1:boolean isPromoted(int):268 -> g
-    1:1:boolean isPromotedToPublic():237 -> g
-    2:2:boolean isSet(int):254:254 -> g
-    2:2:boolean isPromoted(int):268 -> g
-    2:2:boolean isPromotedToPublic():237 -> g
-    1:1:boolean isProtected():180:180 -> h
+    1:1:boolean isFinal():205:205 -> f
+    1:1:boolean isPrivate():167:167 -> g
+    1:1:boolean wasSet(int):254:254 -> h
+    1:1:boolean isPromoted(int):272 -> h
+    1:1:boolean isPromotedToPublic():241 -> h
+    2:2:boolean isSet(int):258:258 -> h
+    2:2:boolean isPromoted(int):272 -> h
+    2:2:boolean isPromotedToPublic():241 -> h
     1:1:int hashCode():109:109 -> hashCode
-    1:1:boolean isPublic():154:154 -> i
-    1:1:boolean isStatic():193:193 -> j
-    1:1:boolean isSynthetic():217:217 -> k
-    1:1:int materialize():67:67 -> l
-    1:1:void promoteToFinal():229:229 -> m
-    1:1:void demote(int):276:276 -> n
-    1:1:void promoteToPublic():241 -> n
-    2:2:void promoteToPublic():242:242 -> n
-    1:1:void promoteToStatic():246:246 -> o
-    1:1:void setFinal():209:209 -> p
-    1:2:void setPrivate():171:172 -> q
-    1:2:void setProtected():184:185 -> r
-    1:2:void setPublic():158:159 -> s
-    1:1:void setStatic():197:197 -> t
-    1:1:java.lang.String toString():285:285 -> toString
-    1:1:void setSynthetic():221:221 -> u
-    1:1:java.lang.String toSmaliString():280:280 -> v
-    1:1:void unsetPrivate():176:176 -> w
-    1:1:void unsetProtected():189:189 -> x
-    1:1:void unsetPublic():163:163 -> y
-    1:1:void unsetSynthetic():225:225 -> z
+    1:1:boolean isProtected():180:180 -> i
+    1:1:boolean isPublic():154:154 -> j
+    1:1:boolean isStatic():193:193 -> k
+    1:1:boolean isSynthetic():217:217 -> l
+    1:1:int materialize():67:67 -> m
+    1:1:void promoteToFinal():233:233 -> n
+    1:2:void promoteToPublic():245:246 -> o
+    1:1:void promoteToStatic():250:250 -> p
+    1:1:void setFinal():209:209 -> q
+    1:2:void setPrivate():171:172 -> r
+    1:2:void setProtected():184:185 -> s
+    1:2:void setPublic():158:159 -> t
+    1:1:java.lang.String toString():289:289 -> toString
+    1:1:void setStatic():197:197 -> u
+    1:1:void setSynthetic():221:221 -> v
+    1:1:java.lang.String toSmaliString():284:284 -> w
+    1:1:void unsetPrivate():176:176 -> x
+    1:1:void unsetProtected():189:189 -> y
+    1:1:void unsetPublic():163:163 -> z
 com.android.tools.r8.graph.AppInfo -> com.android.tools.r8.graph.c:
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):42:42 -> <init>
@@ -15414,17 +15355,17 @@
     10:10:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):109:109 -> a
     11:16:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):313:318 -> a
     17:17:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):371:371 -> a
-    18:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):586:592 -> a
+    18:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):599:605 -> a
     18:24:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):371 -> a
-    25:27:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):608:610 -> a
-    25:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):599 -> a
+    25:27:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):621:623 -> a
+    25:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):612 -> a
     25:27:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):371 -> a
     28:28:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():148:148 -> a
-    28:28:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):610 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):599 -> a
+    28:28:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):623 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):612 -> a
     28:28:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):371 -> a
-    29:31:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):610:612 -> a
-    29:31:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):599 -> a
+    29:31:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):623:625 -> a
+    29:31:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):612 -> a
     29:31:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):371 -> a
     32:51:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):373:392 -> a
     52:59:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):413:420 -> a
@@ -15519,42 +15460,40 @@
     35:69:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):290:324 -> a
     35:69:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):285 -> a
     70:72:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):432:434 -> a
-    73:85:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):543:555 -> a
-    86:119:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):646:679 -> a
+    73:85:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):539:551 -> a
+    86:119:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):584:617 -> a
     1:20:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):152:171 -> addSynthesizedClass
     21:46:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):170:195 -> addSynthesizedClass
-    1:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):482:490 -> allImmediateExtendsSubtypes
-    1:5:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):506:510 -> allImmediateImplementsSubtypes
+    1:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):478:486 -> allImmediateExtendsSubtypes
+    1:5:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):502:506 -> 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):230:233 -> b
     1:2:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):239:240 -> c
-    1:49:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):574:622 -> computeLeastUpperBoundOfClasses
-    1:1:boolean lambda$allImmediateExtendsSubtypes$1(com.android.tools.r8.graph.DexType):485:485 -> d
-    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):488:488 -> e
-    1:1:boolean lambda$allImmediateImplementsSubtypes$3(com.android.tools.r8.graph.DexType):508:508 -> f
-    1:1:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):478:478 -> forAllImmediateExtendsSubtypes
-    1:1:void forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):502:502 -> forAllImmediateImplementsSubtypes
+    1:1:boolean lambda$allImmediateExtendsSubtypes$1(com.android.tools.r8.graph.DexType):481:481 -> d
+    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):484:484 -> e
+    1:1:boolean lambda$allImmediateImplementsSubtypes$3(com.android.tools.r8.graph.DexType):504:504 -> f
+    1:1:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):474:474 -> forAllImmediateExtendsSubtypes
+    1:1:void forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):498:498 -> forAllImmediateImplementsSubtypes
     1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):230:230 -> g
     1:2:java.util.Set getMissingClasses():216:217 -> getMissingClasses
-    1:4:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):560:563 -> getSingleSubtype
+    1:4:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):556:559 -> 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):563 -> getSingleSubtype
+    5:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):559 -> 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):563 -> getSingleSubtype
-    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):563:563 -> getSingleSubtype
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):559 -> getSingleSubtype
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):559:559 -> getSingleSubtype
     1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexProgramClass):332:332 -> hasAnyInstantiatedLambdas
-    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):467:467 -> hasSubtypes
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):463:463 -> hasSubtypes
     1:1:boolean hasSubtyping():444:444 -> hasSubtyping
-    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):528:539 -> implementedInterfaces
-    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):538:538 -> implementedInterfaces
-    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):628:628 -> inDifferentHierarchy
-    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):519:519 -> isExternalizable
-    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):463:463 -> isMarkedAsInterface
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):514:514 -> isMissingOrHasMissingSuperType
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):746:750 -> isMissingOrHasMissingSuperType
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):515 -> isMissingOrHasMissingSuperType
-    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):523:523 -> isSerializable
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):524:535 -> implementedInterfaces
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):534:534 -> implementedInterfaces
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):566:566 -> inDifferentHierarchy
+    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):515:515 -> isExternalizable
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):510:510 -> isMissingOrHasMissingSuperType
+    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):751:755 -> isMissingOrHasMissingSuperType
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):511 -> isMissingOrHasMissingSuperType
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):519:519 -> isSerializable
     1:4:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):425:428 -> isStringConcat
     1:1:boolean isUnknown(com.android.tools.r8.graph.DexType):459:459 -> isUnknown
     2:2:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():104:104 -> isUnknown
@@ -15568,7 +15507,7 @@
     12:12:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):394 -> lookupLambdaImplementedMethods
     13:26:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):405:418 -> lookupLambdaImplementedMethods
     27:27:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):387:387 -> lookupLambdaImplementedMethods
-    1:10:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):632:641 -> mayHaveFinalizeMethodDirectlyOrIndirectly
+    1:10:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):570:579 -> mayHaveFinalizeMethodDirectlyOrIndirectly
     1:7:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):350:356 -> 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):356 -> methodDefinedInInterface
@@ -15586,12 +15525,11 @@
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType):52:52 -> <init>
     2:13:void <init>(com.android.tools.r8.graph.DexType):42:53 -> <init>
-    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):38:38 -> a
-    2:3:void ensureDirectSubTypeSet():62:63 -> a
-    4:14:void setLevel(int):68:78 -> a
-    15:17:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):110:112 -> a
-    1:4:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):83:86 -> b
-    5:7:boolean isInterface():98:100 -> b
+    1:2:void ensureDirectSubTypeSet():62:63 -> a
+    3:13:void setLevel(int):68:78 -> a
+    14:17:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):83:86 -> a
+    18:20:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):110:112 -> a
+    1:3:boolean isInterface():98:100 -> b
     1:1:void tagAsInterface():94:94 -> c
     1:1:void tagAsSubtypeRoot():90:90 -> d
     1:1:java.lang.String toString():58:58 -> toString
@@ -15675,18 +15613,19 @@
     13:13:void setClassesEscapingIntoLibrary(java.util.function.Predicate):162:162 -> a
     14:14:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):166:166 -> a
     15:15:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):170:170 -> a
-    16:16:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):195:195 -> a
-    17:18:void withGeneratedExtensionRegistryShrinker(java.util.function.Consumer):232:233 -> a
-    19:20:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):239:240 -> a
-    21:22:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):280:281 -> a
-    23:23:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):289:289 -> a
-    24:25:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):309:310 -> a
-    26:26:void setUnneededVisibilityBridgeMethods(java.util.Set):318:318 -> a
-    27:27:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):340:340 -> a
-    28:28:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):350:350 -> a
-    29:30:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):374:375 -> a
-    31:31:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> a
-    31:31:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):376 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> a
+    17:17:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):195:195 -> a
+    18:19:void withGeneratedExtensionRegistryShrinker(java.util.function.Consumer):231:232 -> a
+    20:21:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):238:239 -> a
+    22:23:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):279:280 -> a
+    24:24:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):288:288 -> a
+    25:26:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):308:309 -> a
+    27:27:void setUnneededVisibilityBridgeMethods(java.util.Set):317:317 -> a
+    28:28:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):339:339 -> a
+    29:29:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):349:349 -> a
+    30:31:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):373:374 -> a
+    32:32:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> a
+    32:32:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):375 -> a
     1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):112:112 -> b
     2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():25:25 -> b
     2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):72 -> b
@@ -15697,35 +15636,37 @@
     4:4:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):112 -> b
     5:5:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):117:117 -> b
     6:7:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):157:158 -> b
-    8:9:void withGeneratedMessageLiteBuilderShrinker(java.util.function.Consumer):253:254 -> b
-    10:11:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):268:269 -> b
-    12:17:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():322:327 -> b
+    8:9:void withGeneratedMessageLiteBuilderShrinker(java.util.function.Consumer):252:253 -> b
+    10:11:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):267:268 -> b
+    12:17:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():321:326 -> b
     1:1:com.android.tools.r8.graph.AppInfo appInfo():125:125 -> c
-    2:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):201:205 -> c
+    2:5:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):199:202 -> c
+    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):190:190 -> c
+    6:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):203 -> c
     7:7:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> c
-    7:7:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):206 -> c
+    7:7:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):205 -> c
     8:8:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):207:207 -> c
     9:9:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> c
-    9:9:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):210 -> c
-    10:11:void withGeneratedMessageLiteShrinker(java.util.function.Consumer):246:247 -> c
-    12:13:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):260:261 -> c
+    9:9:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):209 -> c
+    10:11:void withGeneratedMessageLiteShrinker(java.util.function.Consumer):245:246 -> c
+    12:13:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):259:260 -> c
     1:1:com.android.tools.r8.graph.AppServices appServices():149:149 -> d
-    2:3:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):294:295 -> d
+    2:3:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):293:294 -> d
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):190:190 -> definitionFor
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():215:215 -> dexItemFactory
-    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():223:223 -> e
-    1:1:boolean enableWholeProgramOptimizations():219:219 -> f
-    1:1:com.android.tools.r8.graph.GraphLense graphLense():275:275 -> g
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():214:214 -> dexItemFactory
+    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():222:222 -> e
+    1:1:boolean enableWholeProgramOptimizations():218:218 -> f
+    1:1:com.android.tools.r8.graph.GraphLense graphLense():274:274 -> g
     1:1:boolean isAllCodeProcessed():141:141 -> h
-    1:1:com.android.tools.r8.utils.InternalOptions options():301:301 -> i
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():227:227 -> j
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():305:305 -> k
+    1:1:com.android.tools.r8.utils.InternalOptions options():300:300 -> i
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():226:226 -> j
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():304:304 -> k
     1:1:void setAllCodeProcessed():145:145 -> l
-    1:1:java.util.Set unneededVisibilityBridgeMethods():314:314 -> m
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():346:346 -> n
-    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():355:355 -> o
+    1:1:java.util.Set unneededVisibilityBridgeMethods():313:313 -> m
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():345:345 -> n
+    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():354:354 -> o
     com.android.tools.r8.graph.AppView withLiveness() -> p
-    1:1:com.android.tools.r8.graph.AppView withSubtyping():362:362 -> q
+    1:1:com.android.tools.r8.graph.AppView withSubtyping():361:361 -> q
 com.android.tools.r8.graph.AppView$WholeProgramOptimizations -> com.android.tools.r8.graph.g$a:
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations ON -> a
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations OFF -> b
@@ -15747,7 +15688,7 @@
     1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):101:101 -> getRenamedFieldSignature
     1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):106:106 -> getRenamedMethodSignature
     1:1:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):121:121 -> lookupMethod
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):126:126 -> lookupPrototypeChanges
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):126:126 -> lookupPrototypeChanges
     1:5:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):111:115 -> lookupType
 com.android.tools.r8.graph.ArgumentUse -> com.android.tools.r8.graph.i:
     1:1:void <init>():7:7 -> <init>
@@ -15766,7 +15707,7 @@
     9:21:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):103:115 -> a
     22:23:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):124:125 -> a
     22:23:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):116 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):368:368 -> 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):366:366 -> a
     24:24:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):125 -> a
     24:24:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):116 -> a
     25:26:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):128:129 -> a
@@ -15774,7 +15715,7 @@
     27:31:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):126:130 -> a
     27:31:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):116 -> a
     32:32:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):118:118 -> a
-    33:38:void writeAnnotations(com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):134:139 -> a
+    33:42:void writeAnnotations(com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):134:143 -> a
     void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
     1:18:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):54:71 -> c
     1:1:void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):98:98 -> d
@@ -15805,71 +15746,71 @@
     int maxLocals -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):109:115 -> <init>
-    1:1:java.util.List getInstructions():135:135 -> a
-    2:2:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):200:200 -> a
-    3:12:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):179:188 -> a
-    3:12:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):202 -> a
-    13:13:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):203:203 -> a
+    1:1:java.util.List getInstructions():139:139 -> a
+    2:2:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):204:204 -> a
+    3:12:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):183:192 -> a
+    3:12:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):206 -> 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):207:207 -> a
     14:14:void com.android.tools.r8.cf.code.CfLabel.write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):45:45 -> a
-    14:14:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):204 -> a
-    15:16:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):206:207 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():328 -> a
-    17:17:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):209 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():329:329 -> a
-    18:18:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):209 -> a
-    19:35:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):212:228 -> a
-    36:49:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):222:235 -> a
-    50:56:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):234:240 -> a
-    57:57:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):239:239 -> a
-    58:63:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):252:257 -> a
-    64:64:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):252:252 -> a
-    65:67:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):311:313 -> a
-    68:68:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):312:312 -> a
-    69:70:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):335:336 -> a
-    69:70:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):321 -> a
-    71:82:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):335:346 -> a
-    71:82:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):321 -> a
-    83:83:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):345:345 -> a
-    83:83:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):321 -> a
-    84:93:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):365:374 -> a
-    94:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):490:501 -> a
+    14:14:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):208 -> a
+    15:16:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):210:211 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():332 -> 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):213 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():333:333 -> a
+    18:18:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):213 -> a
+    19:35:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):216:232 -> a
+    36:49:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):226:239 -> a
+    50:56:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):238:244 -> a
+    57:57:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):243:243 -> a
+    58:64:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):256:256 -> a
+    65:67:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):315:317 -> a
+    68:68:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):316:316 -> a
+    69:71:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):339:339 -> a
+    69:71:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):325 -> a
+    80:82:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):348:350 -> a
+    80:82:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):325 -> a
+    83:83:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):349:349 -> a
+    83:83:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):325 -> a
+    84:93:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):369:378 -> a
+    94:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):494:505 -> a
     106:106:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():124:124 -> a
-    106:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):501 -> a
+    106:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):505 -> a
     107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():269:269 -> a
-    107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):502 -> a
-    108:117:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):503:512 -> a
-    118:126:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):510:518 -> a
+    107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):506 -> a
+    108:117:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):507:516 -> a
+    118:126:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):514:522 -> a
     127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():277:277 -> a
-    127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):521 -> a
-    128:128:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):521:521 -> a
-    129:153:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):527:551 -> a
+    127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):525 -> a
+    128:128:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):525:525 -> a
+    129:153:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):531:555 -> a
     154:155:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):59:60 -> a
-    154:155:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):551 -> a
-    156:156:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):548:548 -> a
-    1:1:java.util.List getLocalVariables():139:139 -> b
-    2:3:int countNonStackOperations(int):154:155 -> b
-    1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):285:285 -> buildIR
-    1:3:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):297:299 -> buildInliningIR
+    154:155:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):555 -> a
+    156:156:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):552:552 -> a
+    1:1:java.util.List getLocalVariables():143:143 -> b
+    2:3:int countNonStackOperations(int):158:159 -> b
+    1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):289:289 -> buildIR
+    1:3:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):301:303 -> buildInliningIR
     1:1:int getMaxLocals():127:127 -> c
-    1:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):393:433 -> collectParameterInfo
-    42:42:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):432:432 -> collectParameterInfo
-    43:43:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):404:404 -> collectParameterInfo
-    1:1:boolean computeEquals(java.lang.Object):268:268 -> computeEquals
-    1:1:int computeHashCode():263:263 -> computeHashCode
+    2:2:void setMaxLocals(int):131:131 -> c
+    1:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):397:437 -> collectParameterInfo
+    42:42:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):436:436 -> collectParameterInfo
+    43:43:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):408:408 -> collectParameterInfo
+    1:1:boolean computeEquals(java.lang.Object):272:272 -> computeEquals
+    1:1:int computeHashCode():267:267 -> computeHashCode
     1:1:int getMaxStack():123:123 -> d
     1:1:com.android.tools.r8.graph.DexType getOriginalHolder():119:119 -> e
-    1:1:int estimatedSizeForInlining():144:144 -> estimatedSizeForInlining
-    1:1:boolean estimatedSizeForInliningAtMost(int):149:149 -> estimatedSizeForInliningAtMost
-    1:1:java.util.List getTryCatchRanges():131:131 -> f
-    1:2:boolean isEmptyVoidMethod():273:274 -> isEmptyVoidMethod
-    1:29:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):441:469 -> registerArgumentReferences
-    1:6:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):379:384 -> registerCodeReferences
-    1:1:java.lang.String toString():476:476 -> toString
+    1:1:int estimatedSizeForInlining():148:148 -> estimatedSizeForInlining
+    1:1:boolean estimatedSizeForInliningAtMost(int):153:153 -> estimatedSizeForInliningAtMost
+    1:1:java.util.List getTryCatchRanges():135:135 -> f
+    1:2:boolean isEmptyVoidMethod():277:278 -> isEmptyVoidMethod
+    1:29:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):445:473 -> registerArgumentReferences
+    1:6:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):383:388 -> registerCodeReferences
+    1:1:java.lang.String toString():480:480 -> toString
     2:2:void com.android.tools.r8.cf.CfPrinter.<init>(com.android.tools.r8.graph.CfCode):120:120 -> toString
-    2:2:java.lang.String toString():476 -> toString
-    3:3:java.lang.String toString():476:476 -> toString
-    4:4:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):481:481 -> toString
+    2:2:java.lang.String toString():480 -> toString
+    3:3:java.lang.String toString():480:480 -> toString
+    4:4:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):485:485 -> toString
 com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.m$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> e
@@ -15892,22 +15833,22 @@
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
-    1:1:com.android.tools.r8.graph.ClassAccessFlags copy():81:81 -> B
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> C
-    1:1:int getAsCfAccessFlags():91 -> C
+    1:1:com.android.tools.r8.graph.ClassAccessFlags copy():81:81 -> C
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> D
-    1:1:int getAsDexAccessFlags():98 -> D
-    2:2:boolean isInterface():155:155 -> D
-    2:2:int getAsDexAccessFlags():99 -> D
-    1:1:boolean isAbstract():167:167 -> E
-    1:1:boolean isAnnotation():179:179 -> F
-    1:1:boolean isEnum():191:191 -> G
-    1:1:boolean isInterface():155:155 -> H
-    1:1:boolean isSuper():199:199 -> I
-    1:1:void setAbstract():171:171 -> J
-    1:1:void unsetAbstract():175:175 -> K
-    1:1:void unsetAnnotation():187:187 -> L
-    1:1:void unsetInterface():163:163 -> M
+    1:1:int getAsCfAccessFlags():91 -> D
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> E
+    1:1:int getAsDexAccessFlags():98 -> E
+    2:2:boolean isInterface():155:155 -> E
+    2:2:int getAsDexAccessFlags():99 -> E
+    1:1:boolean isAbstract():167:167 -> F
+    1:1:boolean isAnnotation():179:179 -> G
+    1:1:boolean isEnum():191:191 -> H
+    1:1:boolean isInterface():155:155 -> I
+    1:1:boolean isSuper():199:199 -> J
+    1:1:void setAbstract():171:171 -> K
+    1:1:void unsetAbstract():175:175 -> L
+    1:1:void unsetAnnotation():187:187 -> M
+    1:1:void unsetInterface():163:163 -> N
     1:1:boolean isInterface():155:155 -> a
     1:1:boolean areValid(int,boolean):132 -> a
     2:2:boolean isSuper():199:199 -> a
@@ -15916,15 +15857,15 @@
     8:8:boolean isEnum():191:191 -> a
     8:8:boolean areValid(int,boolean):144 -> a
     9:9:boolean areValid(int,boolean):146:146 -> a
-    1:8:java.util.List getNames():34:41 -> b
-    1:8:java.util.List getPredicates():46:53 -> d
-    1:1:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):76:76 -> e
-    2:2:void <init>(int):57:57 -> e
-    2:2:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):76 -> e
-    1:1:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):72:72 -> f
+    1:8:java.util.List getNames():34:41 -> c
+    1:8:java.util.List getPredicates():46:53 -> e
+    1:1:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):76:76 -> f
     2:2:void <init>(int):57:57 -> f
-    2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):72 -> f
-    1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):65:67 -> g
+    2:2:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):76 -> f
+    1:1:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):72:72 -> g
+    2:2:void <init>(int):57:57 -> g
+    2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):72 -> g
+    1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):65:67 -> h
 com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.graph.p:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -16021,8 +15962,7 @@
     15:17:com.android.tools.r8.graph.DexType getEnclosingClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):102:104 -> a
     18:18:com.android.tools.r8.graph.DexAnnotation createEnclosingMethodAnnotation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):109:109 -> a
     19:23:com.android.tools.r8.graph.DexAnnotation createMemberClassesAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):175:179 -> a
-    24:27:com.android.tools.r8.graph.DexAnnotation createAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):223:226 -> a
-    28:28:com.android.tools.r8.graph.DexAnnotation createAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):223:223 -> a
+    24:28:com.android.tools.r8.graph.DexAnnotation createAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):223:223 -> a
     29:29:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):231:231 -> a
     30:57:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):302:329 -> a
     30:57:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):232 -> a
@@ -16212,9 +16152,8 @@
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
     void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream) -> a
     1:1:com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider oneFilePerClass(java.nio.file.Path):38:38 -> a
-    2:3:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):39:40 -> a
-    4:7:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):39:42 -> a
-    8:8:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):41:41 -> a
+    2:4:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):39:39 -> a
+    6:8:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):41:41 -> a
     9:11:void ensureParentExists(java.nio.file.Path):31:33 -> a
     9:11:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):43 -> a
     12:12:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):44:44 -> a
@@ -16228,8 +16167,8 @@
     1:2:void write(java.nio.file.Path):49:50 -> b
     3:5:void ensureParentExists(java.nio.file.Path):31:33 -> b
     3:5:void write(java.nio.file.Path):52 -> b
-    6:8:void write(java.nio.file.Path):53:55 -> b
-    9:11:void write(java.nio.file.Path):53:55 -> b
+    6:9:void write(java.nio.file.Path):53:53 -> b
+    11:11:void write(java.nio.file.Path):55:55 -> b
     12:12:void write(java.io.PrintStream):60:60 -> b
     void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeMethodsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
@@ -16250,10 +16189,8 @@
     1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):43:43 -> <init>
     2:22:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):32:52 -> <init>
     1:12:com.android.tools.r8.graph.DexCallSite fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):68:79 -> a
-    13:14:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.JarApplicationReader.getCallSite(java.lang.String,java.lang.String,com.android.tools.r8.graph.DexMethodHandle,java.util.List):101:102 -> a
-    13:14:com.android.tools.r8.graph.DexCallSite fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):83 -> a
-    15:15:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.JarApplicationReader.getCallSite(java.lang.String,java.lang.String,com.android.tools.r8.graph.DexMethodHandle,java.util.List):101:101 -> a
-    15:15:com.android.tools.r8.graph.DexCallSite fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):83 -> a
+    13:15:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.JarApplicationReader.getCallSite(java.lang.String,java.lang.String,com.android.tools.r8.graph.DexMethodHandle,java.util.List):101:101 -> a
+    13:15:com.android.tools.r8.graph.DexCallSite fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):83 -> a
     16:16:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):145:145 -> a
     1:14:com.android.tools.r8.graph.DexEncodedArray getEncodedArray():289:302 -> c
     1:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):120:129 -> collectIndexedItems
@@ -16338,36 +16275,36 @@
     1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):90:90 -> <init>
     2:81:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):40:119 -> <init>
     82:82:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):109:109 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():720:720 -> A
-    1:1:boolean hasClassInitializer():724:724 -> B
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():742:742 -> C
-    1:1:boolean hasDefaultInitializer():728 -> C
-    1:1:boolean hasKotlinInfo():968:968 -> D
-    1:2:boolean hasStaticSynchronizedMethods():997:998 -> E
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():124:124 -> E
-    3:3:boolean hasStaticSynchronizedMethods():998 -> E
-    1:5:java.util.List instanceFields():454:458 -> F
-    1:4:boolean isAnonymousClass():919:922 -> G
-    boolean isClasspathClass() -> H
-    1:1:boolean isEnum():646:646 -> I
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():191:191 -> I
-    2:2:boolean isEnum():646 -> I
-    1:1:boolean isInANest():926:926 -> J
-    1:1:boolean isInterface():642:642 -> K
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> K
-    2:2:boolean isInterface():642 -> K
-    boolean isLibraryClass() -> L
-    1:3:boolean isLocalClass():906:908 -> M
-    1:3:boolean isMemberClass():912:914 -> N
-    1:1:boolean isNestHost():939:939 -> O
-    1:1:boolean isNestMember():943:943 -> P
-    boolean isNotProgramClass() -> Q
-    boolean isProgramClass() -> R
+    1:1:java.util.List getNestMembersClassAttributes():966:966 -> A
+    1:1:com.android.tools.r8.graph.DexType getType():725:725 -> B
+    1:1:boolean hasClassInitializer():729:729 -> C
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():747:747 -> D
+    1:1:boolean hasDefaultInitializer():733 -> D
+    1:1:boolean hasKotlinInfo():973:973 -> E
+    1:2:boolean hasStaticSynchronizedMethods():1002:1003 -> F
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():124:124 -> F
+    3:3:boolean hasStaticSynchronizedMethods():1003 -> F
+    1:5:java.util.List instanceFields():467:471 -> G
+    1:4:boolean isAnonymousClass():924:927 -> H
+    boolean isClasspathClass() -> I
+    1:1:boolean isEnum():659:659 -> J
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():191:191 -> J
+    2:2:boolean isEnum():659 -> J
+    1:1:boolean isInANest():931:931 -> K
+    1:1:boolean isInterface():655:655 -> L
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> L
+    2:2:boolean isInterface():655 -> L
+    boolean isLibraryClass() -> M
+    1:3:boolean isLocalClass():911:913 -> N
+    1:3:boolean isMemberClass():917:919 -> O
+    1:1:boolean isNestHost():944:944 -> P
+    1:1:boolean isNestMember():948:948 -> Q
+    boolean isNotProgramClass() -> R
     1:1:java.lang.Iterable methods():135:135 -> S
-    1:5:java.util.List staticFields():396:400 -> T
-    1:4:boolean verifyNoDuplicateFields():521:524 -> U
-    1:4:boolean verifyNoDuplicateMethods():284:287 -> V
-    1:5:java.util.List virtualMethods():204:208 -> W
+    1:5:java.util.List staticFields():409:413 -> T
+    1:4:boolean verifyNoDuplicateFields():534:537 -> U
+    1:4:boolean verifyNoDuplicateMethods():297:300 -> V
+    1:5:java.util.List virtualMethods():217:221 -> W
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> a
     com.android.tools.r8.graph.DexClass asDexClass() -> a
     java.util.Iterator lambda$allImmediateSupertypes$3(java.util.Iterator) -> a
@@ -16376,112 +16313,114 @@
     4:4:java.lang.Iterable fields(java.util.function.Predicate):129 -> a
     5:11:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):158:164 -> a
     12:22:void appendDirectMethods(java.util.Collection):168:178 -> a
-    23:26:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):190:193 -> a
-    27:30:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):197:200 -> a
-    31:31:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):308:308 -> a
-    32:54:void virtualizeMethods(java.util.Set):329:351 -> a
-    55:59:void forEachField(java.util.function.Consumer):387:391 -> a
-    60:62:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):492:494 -> a
-    63:65:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):498:500 -> a
-    66:67:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):514:515 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):536:536 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):554 -> a
-    69:69:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):531:531 -> a
-    69:69:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):555 -> a
-    70:70:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):560:560 -> a
-    71:72:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):617:618 -> a
-    73:75:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):732:734 -> a
-    76:83:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):791:798 -> a
-    84:92:boolean hasClassInitializerThatCannotBePostponed():812:820 -> a
-    84:92:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):802 -> a
-    93:96:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):805:808 -> a
-    97:97:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):855:855 -> a
-    98:106:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):894:902 -> a
-    107:108:void setNestHost(com.android.tools.r8.graph.DexType):934:935 -> a
-    109:109:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):976:976 -> a
-    110:110:boolean hasInstanceFields():972:972 -> a
-    110:110:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):979 -> a
-    111:111:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):982:982 -> a
+    23:26:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):203:206 -> a
+    27:30:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):210:213 -> a
+    31:31:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):321:321 -> a
+    32:54:void virtualizeMethods(java.util.Set):342:364 -> a
+    55:59:void forEachField(java.util.function.Consumer):400:404 -> a
+    60:62:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):505:507 -> a
+    63:65:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):511:513 -> a
+    66:67:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):527:528 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):549:549 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):567 -> a
+    69:69:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):544:544 -> a
+    69:69:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):568 -> a
+    70:70:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):573:573 -> a
+    71:72:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):630:631 -> a
+    73:75:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):737:739 -> a
+    76:83:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):796:803 -> a
+    84:92:boolean hasClassInitializerThatCannotBePostponed():817:825 -> a
+    84:92:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):807 -> a
+    93:96:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):810:813 -> a
+    97:97:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):860:860 -> a
+    98:106:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):899:907 -> a
+    107:108:void setNestHost(com.android.tools.r8.graph.DexType):939:940 -> a
+    109:109:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):981:981 -> a
+    110:110:boolean hasInstanceFields():977:977 -> a
+    110:110:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):984 -> a
+    111:111:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):987:987 -> a
     112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    112:112:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):982 -> a
-    113:113:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):983:983 -> a
-    114:114:boolean isValid(com.android.tools.r8.utils.InternalOptions):987:987 -> a
-    115:115:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):272:272 -> a
-    115:115:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    116:116:boolean isAbstract():626:626 -> a
-    116:116:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):273 -> a
-    116:116:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    117:118:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):274:275 -> a
-    117:118:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
+    112:112:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):987 -> a
+    113:113:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):988:988 -> a
+    114:114:boolean isValid(com.android.tools.r8.utils.InternalOptions):992:992 -> a
+    115:115:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):285:285 -> a
+    115:115:boolean isValid(com.android.tools.r8.utils.InternalOptions):992 -> a
+    116:116:boolean isAbstract():639:639 -> a
+    116:116:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):286 -> a
+    116:116:boolean isValid(com.android.tools.r8.utils.InternalOptions):992 -> a
+    117:118:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):287:288 -> a
+    117:118:boolean isValid(com.android.tools.r8.utils.InternalOptions):992 -> a
     119:119:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():290:290 -> a
-    119:119:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275 -> a
-    119:119:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    120:121:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275:276 -> a
-    120:121:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    122:126:boolean isValid(com.android.tools.r8.utils.InternalOptions):988:992 -> a
+    119:119:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):288 -> a
+    119:119:boolean isValid(com.android.tools.r8.utils.InternalOptions):992 -> a
+    120:121:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):288:289 -> a
+    120:121:boolean isValid(com.android.tools.r8.utils.InternalOptions):992 -> a
+    122:126:boolean isValid(com.android.tools.r8.utils.InternalOptions):993:997 -> a
     1:5:void removeDirectMethod(int):182:186 -> b
-    6:11:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):212:217 -> b
-    12:21:void appendVirtualMethods(java.util.Collection):221:230 -> b
-    22:24:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):242:244 -> b
-    25:27:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):248:250 -> b
-    28:29:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):264:265 -> b
-    30:34:void forEachMethod(java.util.function.Consumer):293:297 -> b
-    35:37:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):433:435 -> b
-    38:40:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):439:441 -> b
-    41:45:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):504:508 -> b
-    46:46:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):536:536 -> b
-    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):560:560 -> b
-    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):580 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):570:570 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):581 -> b
-    49:49:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):565:565 -> b
-    50:50:boolean isFinal():634:634 -> b
-    50:50:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):638 -> b
-    51:56:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):838:843 -> b
-    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):254:258 -> c
-    6:6:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):531:531 -> c
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):570:570 -> c
-    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):575:575 -> c
-    9:15:boolean isResolvable(com.android.tools.r8.graph.AppView):758:764 -> c
+    6:11:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):225:230 -> b
+    12:21:void appendVirtualMethods(java.util.Collection):234:243 -> b
+    22:24:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):255:257 -> b
+    25:27:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):261:263 -> b
+    28:29:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):277:278 -> b
+    30:34:void forEachMethod(java.util.function.Consumer):306:310 -> b
+    35:37:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):446:448 -> b
+    38:40:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):452:454 -> b
+    41:45:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):517:521 -> b
+    46:46:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):549:549 -> b
+    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):573:573 -> b
+    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):593 -> b
+    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):583:583 -> b
+    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):594 -> b
+    49:49:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):578:578 -> b
+    50:50:boolean isFinal():647:647 -> b
+    50:50:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):651 -> b
+    51:56:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):843:848 -> b
+    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):267:271 -> c
+    6:6:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):544:544 -> c
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):583:583 -> c
+    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):588:588 -> c
+    9:15:boolean isResolvable(com.android.tools.r8.graph.AppView):763:769 -> c
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> c
     16:16:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):299 -> c
-    16:16:boolean isResolvable(com.android.tools.r8.graph.AppView):765 -> c
+    16:16:boolean isResolvable(com.android.tools.r8.graph.AppView):770 -> c
     17:17:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):300:300 -> c
-    17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):765 -> c
+    17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):770 -> c
     18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> c
     18:18:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):299 -> c
-    18:18:boolean isResolvable(com.android.tools.r8.graph.AppView):765 -> c
-    19:22:boolean isResolvable(com.android.tools.r8.graph.AppView):771:774 -> c
+    18:18:boolean isResolvable(com.android.tools.r8.graph.AppView):770 -> c
+    19:22:boolean isResolvable(com.android.tools.r8.graph.AppView):776:779 -> c
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):146:146 -> collectMixedSectionItems
-    boolean isDexClass() -> d
     1:3:java.lang.Iterable methods(java.util.function.Predicate):139:141 -> d
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> d
     4:4:java.lang.Iterable methods(java.util.function.Predicate):139 -> d
-    5:5:boolean isSerializable(com.android.tools.r8.graph.AppView):778:778 -> d
-    1:2:void removeEnclosingMethod(java.util.function.Predicate):871:872 -> e
-    1:1:void removeInnerClasses(java.util.function.Predicate):881:881 -> f
-    boolean isStaticMember() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():720:720 -> h
-    1:1:com.android.tools.r8.graph.DexReference toReference():653 -> h
-    1:3:java.lang.Iterable allImmediateSupertypes():825:827 -> i
-    4:7:java.lang.Iterable allImmediateSupertypes():826:829 -> i
-    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():302:307 -> j
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> k
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> l
-    1:1:void clearEnclosingMethod():867:867 -> m
-    1:1:void clearInnerClasses():877:877 -> n
-    1:1:void clearNestHost():930:930 -> o
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():854:855 -> p
-    1:5:java.util.List directMethods():150:154 -> q
-    1:1:java.lang.Iterable fields():125:125 -> r
-    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():703:712 -> s
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():863:863 -> t
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():885:886 -> u
-    1:1:java.util.List getInnerClasses():859:859 -> v
-    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> w
-    1:5:com.android.tools.r8.graph.DexType getNestHost():947:951 -> x
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():957:957 -> y
-    1:1:java.util.List getNestMembersClassAttributes():961:961 -> z
+    5:6:void removeDirectMethod(com.android.tools.r8.graph.DexMethod):191:192 -> d
+    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> d
+    7:7:void removeDirectMethod(com.android.tools.r8.graph.DexMethod):192 -> d
+    8:8:void removeDirectMethod(com.android.tools.r8.graph.DexMethod):198:198 -> d
+    9:9:boolean isSerializable(com.android.tools.r8.graph.AppView):783:783 -> d
+    boolean isDexClass() -> e
+    1:2:void removeEnclosingMethod(java.util.function.Predicate):876:877 -> e
+    1:1:void removeInnerClasses(java.util.function.Predicate):886:886 -> f
+    boolean isStaticMember() -> i
+    1:1:com.android.tools.r8.graph.DexType getType():725:725 -> j
+    1:1:com.android.tools.r8.graph.DexReference toReference():666 -> j
+    1:3:java.lang.Iterable allImmediateSupertypes():830:832 -> k
+    4:7:java.lang.Iterable allImmediateSupertypes():831:834 -> k
+    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():315:320 -> l
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> m
+    1:1:void clearEnclosingMethod():872:872 -> n
+    1:1:void clearInnerClasses():882:882 -> o
+    1:1:void clearNestHost():935:935 -> p
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():859:860 -> q
+    1:5:java.util.List directMethods():150:154 -> r
+    1:1:java.lang.Iterable fields():125:125 -> s
+    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():708:717 -> t
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():868:868 -> u
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():890:891 -> v
+    1:1:java.util.List getInnerClasses():864:864 -> w
+    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> x
+    1:5:com.android.tools.r8.graph.DexType getNestHost():952:956 -> y
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():962:962 -> z
 com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.D$a:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.graph.D$b:
@@ -16490,12 +16429,12 @@
     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>
-    boolean isClasspathClass() -> H
-    boolean isNotProgramClass() -> Q
+    boolean isClasspathClass() -> I
+    boolean isNotProgramClass() -> R
     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
-    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():90:90 -> w
+    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():90:90 -> x
 com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.F:
     com.android.tools.r8.graph.DexCode$Try[] tries -> d
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> i
@@ -16825,8 +16764,7 @@
     1:3:int computeHashCode():37:39 -> computeHashCode
     1:8:java.lang.String toString():71:78 -> toString
 com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.graph.M:
-    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:5:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:17 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.graph.DexDebugEvent):19:19 -> a
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> b
 com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.N:
@@ -16857,19 +16795,21 @@
 com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.O:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.DexClass asDexClass() -> a
-    1:1:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):61:61 -> a
-    2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):53:53 -> a
-    2:2:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):61 -> a
+    1:1:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):69:69 -> a
+    2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):61:61 -> a
+    2:2:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):69 -> a
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> b
-    1:1:java.util.stream.Stream filterDexEncodedMethod(java.util.stream.Stream):65:65 -> b
-    2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):53:53 -> b
-    2:2:java.util.stream.Stream filterDexEncodedMethod(java.util.stream.Stream):65 -> b
+    1:1:java.util.stream.Stream filterDexEncodedMethod(java.util.stream.Stream):73:73 -> b
+    2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):61:61 -> b
+    2:2:java.util.stream.Stream filterDexEncodedMethod(java.util.stream.Stream):73 -> b
     com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod() -> c
-    boolean isDexClass() -> d
-    boolean isDexEncodedField() -> e
-    boolean isDexEncodedMethod() -> f
-    boolean isStaticMember() -> g
-    com.android.tools.r8.graph.DexReference toReference() -> h
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> d
+    boolean isDexClass() -> e
+    boolean isDexEncodedField() -> f
+    boolean isDexEncodedMethod() -> g
+    boolean isProgramClass() -> h
+    boolean isStaticMember() -> i
+    com.android.tools.r8.graph.DexReference toReference() -> j
 com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.graph.P:
 com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.Q:
     com.android.tools.r8.graph.DexAnnotationElement[] elements -> b
@@ -16915,57 +16855,50 @@
     1:2:void <clinit>():22:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):37:37 -> <init>
     2:13:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):30:41 -> <init>
-    1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):45:47 -> a
-    4:4:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):67:67 -> a
-    5:6:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMemberInfo):75:76 -> a
-    7:7:boolean isStatic():139:139 -> a
-    7:7:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):215 -> a
-    8:8:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):218:218 -> a
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    9:9:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):218 -> a
-    10:19:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):222:231 -> a
-    20:20:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):230:230 -> a
-    21:23:void setStaticValue(com.android.tools.r8.graph.DexValue):161:163 -> a
-    24:24:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):178:178 -> a
-    25:25:boolean isStatic():139:139 -> a
-    25:25:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):181 -> a
-    26:27:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):181:182 -> a
-    28:28:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():53:53 -> a
-    28:28:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):186 -> a
-    29:35:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):186:192 -> a
-    36:43:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):191:198 -> a
-    44:44:boolean isStatic():139:139 -> a
-    44:44:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):198 -> a
-    45:45:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):199:199 -> a
-    46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    46:46:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):199 -> a
-    47:51:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):200:204 -> a
-    52:52:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):183:183 -> a
-    52:52:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):204 -> a
-    53:53:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):205:205 -> a
-    54:54:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):183:183 -> a
-    54:54:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):204 -> a
-    55:55:boolean lambda$mayTriggerClassInitializationSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):226:226 -> a
-    56:56:java.lang.Boolean lambda$mayTriggerClassInitializationSideEffects$1(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):231:231 -> a
-    57:64:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):238:245 -> a
+    1:2:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):45:46 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    3:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):46 -> a
+    4:4:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):47:47 -> a
+    5:5:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):67:67 -> a
+    6:7:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMemberInfo):75:76 -> a
+    8:10:void setStaticValue(com.android.tools.r8.graph.DexValue):161:163 -> a
+    11:11:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):178:178 -> a
+    12:12:boolean isStatic():139:139 -> a
+    12:12:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):181 -> a
+    13:14:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):181:182 -> a
+    15:15:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():53:53 -> a
+    15:15:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):186 -> a
+    16:22:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):186:192 -> a
+    23:30:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):191:198 -> a
+    31:31:boolean isStatic():139:139 -> a
+    31:31:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):198 -> a
+    32:32:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):199:199 -> a
+    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    33:33:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):199 -> a
+    34:39:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):200:205 -> a
+    40:47:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):238:245 -> a
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> b
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):86:87 -> 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 collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):87 -> collectIndexedItems
     4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):88:89 -> collectIndexedItems
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):95:95 -> collectMixedSectionItems
-    boolean isDexEncodedField() -> e
-    1:1:boolean isStatic():139:139 -> g
-    1:1:boolean isStaticMember():148 -> g
-    1:1:com.android.tools.r8.graph.DexReference toReference():120:120 -> h
-    1:1:com.android.tools.r8.graph.DexField getKey():115:115 -> i
-    1:1:com.android.tools.r8.graph.PresortedComparable getKey():22 -> i
-    1:1:com.android.tools.r8.graph.DexField getKey():115:115 -> j
-    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():57:63 -> k
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():53:53 -> l
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():167:168 -> m
-    1:1:boolean hasAnnotation():152:152 -> n
-    1:2:boolean hasExplicitStaticValue():156:157 -> o
+    boolean isDexEncodedField() -> f
+    1:1:boolean isStatic():139:139 -> i
+    1:1:boolean isStaticMember():148 -> i
+    1:1:com.android.tools.r8.graph.DexReference toReference():120:120 -> j
+    1:1:com.android.tools.r8.graph.DexField getKey():115:115 -> k
+    1:1:com.android.tools.r8.graph.PresortedComparable getKey():22 -> k
+    1:1:com.android.tools.r8.graph.DexField getKey():115:115 -> l
+    1:1:com.android.tools.r8.kotlin.KotlinMemberInfo getKotlinMemberInfo():71:71 -> m
+    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():57:63 -> n
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():53:53 -> o
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():167:168 -> p
+    1:1:boolean hasAnnotation():152:152 -> q
+    1:2:boolean hasExplicitStaticValue():156:157 -> r
+    1:1:boolean isKotlinBackingField():80:80 -> s
+    2:2:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isBackingField():73:73 -> s
+    2:2:boolean isKotlinBackingField():80 -> s
     1:1:java.lang.String toSmaliString():105:105 -> toSmaliString
     1:1:java.lang.String toSourceString():110:110 -> toSourceString
     1:1:java.lang.String toString():100:100 -> toString
@@ -16995,71 +16928,74 @@
     2:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):223:223 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int,boolean):243:243 -> <init>
     4:123:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int,boolean):134:253 -> <init>
-    1:2:boolean isClassInitializer():313:314 -> A
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> A
-    3:3:boolean isClassInitializer():314 -> A
-    4:4:boolean isClassInitializer():314:314 -> A
-    1:1:boolean isD8R8Synthesized():161:161 -> B
-    1:1:boolean isDefaultMethod():319:319 -> C
-    2:2:boolean isAbstract():290:290 -> C
-    2:2:boolean isDefaultMethod():319 -> C
-    3:3:boolean isDefaultMethod():319:319 -> C
-    1:2:boolean isDirectMethod():371:372 -> D
+    1:2:boolean hasClassFileVersion():652:653 -> A
+    1:1:boolean hasCode():632:632 -> B
+    1:1:boolean hasParameterInfo():587:587 -> C
+    1:2:boolean isClassInitializer():313:314 -> D
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> D
-    3:3:boolean isDirectMethod():372 -> D
-    4:4:boolean isDirectMethod():372:372 -> D
-    1:1:boolean isFinal():294:294 -> E
-    1:2:boolean isInitializer():298:299 -> F
-    1:2:boolean isInstanceInitializer():303:304 -> G
+    3:3:boolean isClassInitializer():314 -> D
+    4:4:boolean isClassInitializer():314:314 -> D
+    1:1:boolean isD8R8Synthesized():161:161 -> E
+    1:1:boolean isDefaultMethod():319:319 -> F
+    2:2:boolean isAbstract():290:290 -> F
+    2:2:boolean isDefaultMethod():319 -> F
+    3:3:boolean isDefaultMethod():319:319 -> F
+    1:2:boolean isDirectMethod():371:372 -> G
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> G
-    3:3:boolean isInstanceInitializer():304 -> G
-    4:4:boolean isInstanceInitializer():304:304 -> G
-    1:1:boolean isKotlinExtensionFunction():422:422 -> H
-    2:2:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isExtensionFunction():63:63 -> H
-    2:2:boolean isKotlinExtensionFunction():422 -> H
-    1:1:boolean isKotlinExtensionProperty():430:430 -> I
-    1:1:boolean isKotlinFunction():418:418 -> J
-    2:2:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isFunction():59:59 -> J
-    2:2:boolean isKotlinFunction():418 -> J
-    3:3:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isExtensionFunction():63:63 -> J
-    3:3:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isFunction():59 -> J
-    3:3:boolean isKotlinFunction():418 -> J
-    4:4:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isFunction():59:59 -> J
-    4:4:boolean isKotlinFunction():418 -> J
-    1:1:boolean isKotlinProperty():426:426 -> K
-    2:2:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isBackingField():67:67 -> K
-    2:2:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isProperty():71 -> K
-    2:2:boolean isKotlinProperty():426 -> K
-    3:7:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isProperty():71:75 -> K
-    3:7:boolean isKotlinProperty():426 -> K
-    8:8:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isBackingField():67:67 -> K
-    8:8:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isProperty():71 -> K
-    8:8:boolean isKotlinProperty():426 -> K
-    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():257:257 -> L
-    1:2:boolean isNonAbstractNonNativeMethod():348:349 -> M
-    1:2:boolean isNonAbstractVirtualMethod():343:344 -> N
-    1:2:boolean isNonPrivateVirtualMethod():334:335 -> O
-    1:1:boolean isObsolete():171:171 -> P
-    1:1:boolean isOnlyInlinedIntoNestMembers():434:434 -> Q
-    1:2:boolean isPrivateMethod():363:364 -> R
-    1:2:boolean isProcessed():285:286 -> S
-    1:2:boolean isPublicMethod():358:359 -> T
-    1:2:boolean isPublicized():353:354 -> U
-    1:2:boolean isStatic():377:378 -> V
-    1:2:boolean isSyntheticMethod():391:392 -> W
-    1:2:boolean isVirtualMethod():329:330 -> X
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> X
-    3:3:boolean isVirtualMethod():330 -> X
-    1:2:void markNotProcessed():538:539 -> Y
-    1:2:java.lang.String qualifiedName():664:665 -> Z
+    3:3:boolean isDirectMethod():372 -> G
+    4:4:boolean isDirectMethod():372:372 -> G
+    1:1:boolean isFinal():294:294 -> H
+    1:2:boolean isInitializer():298:299 -> I
+    1:2:boolean isInstanceInitializer():303:304 -> J
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> J
+    3:3:boolean isInstanceInitializer():304 -> J
+    4:4:boolean isInstanceInitializer():304:304 -> J
+    1:1:boolean isKotlinExtensionFunction():422:422 -> K
+    2:2:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isExtensionFunction():69:69 -> K
+    2:2:boolean isKotlinExtensionFunction():422 -> K
+    1:1:boolean isKotlinFunction():418:418 -> L
+    2:2:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isFunction():65:65 -> L
+    2:2:boolean isKotlinFunction():418 -> L
+    3:3:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isExtensionFunction():69:69 -> L
+    3:3:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isFunction():65 -> L
+    3:3:boolean isKotlinFunction():418 -> L
+    4:4:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isFunction():65:65 -> L
+    4:4:boolean isKotlinFunction():418 -> L
+    1:1:boolean isKotlinProperty():426:426 -> M
+    2:2:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isBackingField():73:73 -> M
+    2:2:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isProperty():77 -> M
+    2:2:boolean isKotlinProperty():426 -> M
+    3:3:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isProperty():77:77 -> M
+    3:3:boolean isKotlinProperty():426 -> M
+    4:4:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isExtensionProperty():85:85 -> M
+    4:4:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isProperty():81 -> M
+    4:4:boolean isKotlinProperty():426 -> M
+    5:5:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isBackingField():73:73 -> M
+    5:5:boolean com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind.isProperty():77 -> M
+    5:5:boolean isKotlinProperty():426 -> M
+    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():257:257 -> N
+    1:2:boolean isNonAbstractNonNativeMethod():348:349 -> O
+    1:2:boolean isNonAbstractVirtualMethod():343:344 -> P
+    1:2:boolean isNonPrivateVirtualMethod():334:335 -> Q
+    1:1:boolean isObsolete():171:171 -> R
+    1:1:boolean isOnlyInlinedIntoNestMembers():434:434 -> S
+    1:2:boolean isPrivateMethod():363:364 -> T
+    1:2:boolean isProcessed():285:286 -> U
+    1:2:boolean isPublicMethod():358:359 -> V
+    1:2:boolean isPublicized():353:354 -> W
+    1:2:boolean isStatic():377:378 -> X
+    1:2:boolean isSyntheticMethod():391:392 -> Y
+    1:2:boolean isVirtualMethod():329:330 -> Z
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> Z
+    3:3:boolean isVirtualMethod():330 -> Z
     1:1:boolean access$300(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
     2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):79:79 -> a
     3:3:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$602(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):79:79 -> a
     4:6:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):261:263 -> a
     7:7:boolean com.android.tools.r8.utils.BooleanLatticeElement.isPossiblyFalse():52:52 -> a
     7:7:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):263 -> a
-    8:9:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):263:264 -> a
-    10:15:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):263:268 -> a
+    8:10:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):263:263 -> a
+    13:15:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):266:268 -> a
     16:16:boolean com.android.tools.r8.utils.BooleanLatticeElement.isPossiblyFalse():52:52 -> a
     16:16:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):269 -> a
     17:22:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):268:273 -> a
@@ -17163,8 +17099,7 @@
     490:490:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
     490:490:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1010 -> a
     491:496:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1047:1052 -> a
-    497:497:void com.android.tools.r8.graph.AccessFlags.demote(int):276:276 -> a
-    497:497:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():233 -> a
+    497:497:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():237:237 -> a
     497:497:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1052 -> a
     498:505:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1054:1061 -> a
     506:506:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> a
@@ -17184,16 +17119,16 @@
     565:575:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1144:1154 -> a
     576:577:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1222:1223 -> a
     578:579:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1233:1234 -> a
-    1:2:void removeCode():641:642 -> a0
+    1:2:void markNotProcessed():538:539 -> a0
     1:1:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> b
     2:5:void upgradeClassFileVersion(int):657:660 -> b
     6:6:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):942:942 -> b
     7:34:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):1016:1043 -> b
-    1:1:void setObsolete():177:177 -> b0
+    1:2:java.lang.String qualifiedName():664:665 -> b0
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$500(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> c
     2:5:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):1031:1034 -> c
     6:6:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1185:1185 -> c
-    1:1:boolean shouldNotHaveCode():628:628 -> c0
+    1:2:void removeCode():641:642 -> c0
     1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):603:609 -> collectIndexedItems
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):614:614 -> collectMixedSectionItems
     1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> d
@@ -17201,52 +17136,49 @@
     6:6:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
     6:6:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1198 -> d
     7:7:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1200:1200 -> d
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():712:718 -> d0
-    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> d0
-    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():718 -> d0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():719:719 -> d0
+    1:1:void setObsolete():177:177 -> d0
     1:1:com.android.tools.r8.kotlin.KotlinMemberInfo access$700(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> e
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():783:789 -> e0
+    1:1:boolean shouldNotHaveCode():628:628 -> e0
     1:1:int access$800(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> f
-    2:2:boolean isDexEncodedMethod():1179:1179 -> f
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():759:768 -> f0
-    1:2:boolean isStaticMember():383:384 -> g
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1254:1254 -> g
-    1:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1118:1126 -> g0
-    10:10:void setObsolete():177:177 -> g0
-    10:10:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1127 -> g0
-    1:2:com.android.tools.r8.graph.DexReference toReference():1173:1174 -> h
-    3:4:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1238:1239 -> h
-    5:6:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1209:1210 -> h
-    5:6:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1241 -> h
-    7:11:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1241:1245 -> h
-    1:1:void unsetObsolete():204:204 -> h0
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():712:718 -> f0
+    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> f0
+    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():718 -> f0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():719:719 -> f0
+    1:1:boolean isDexEncodedMethod():1179:1179 -> g
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1250:1250 -> g
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():783:789 -> g0
+    1:4:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1238:1241 -> h
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():759:768 -> h0
     1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):185:189 -> i
     6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> i
     6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):189 -> i
     7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):190:191 -> i
-    9:9:com.android.tools.r8.graph.DexMethod getKey():1168:1168 -> i
-    9:9:com.android.tools.r8.graph.PresortedComparable getKey():79 -> i
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():772:779 -> j
-    9:9:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1250:1250 -> j
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():748:749 -> k
-    1:1:void checkIfObsolete():165:165 -> l
-    1:2:java.lang.String codeToString():1160:1161 -> m
-    1:2:java.lang.String descriptor():669:670 -> n
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1227:1228 -> o
-    1:3:int getClassFileVersion():646:648 -> p
-    1:2:com.android.tools.r8.graph.Code getCode():636:637 -> q
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():181:181 -> r
-    1:1:com.android.tools.r8.graph.DexMethod getKey():1168:1168 -> s
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1214:1218 -> t
+    9:10:boolean isStaticMember():383:384 -> i
+    1:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1118:1126 -> i0
+    10:10:void setObsolete():177:177 -> i0
+    10:10:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1127 -> i0
+    1:2:com.android.tools.r8.graph.DexReference toReference():1173:1174 -> j
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1246:1246 -> j
+    1:1:void unsetObsolete():204:204 -> j0
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1168:1168 -> k
+    1:1:com.android.tools.r8.graph.PresortedComparable getKey():79 -> k
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():772:779 -> l
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():748:749 -> m
+    1:1:void checkIfObsolete():165:165 -> n
+    1:2:java.lang.String codeToString():1160:1161 -> o
+    1:2:java.lang.String descriptor():669:670 -> p
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1227:1228 -> q
+    1:3:int getClassFileVersion():646:648 -> r
+    1:2:com.android.tools.r8.graph.Code getCode():636:637 -> s
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():181:181 -> t
     1:2:java.lang.String toSourceString():707:708 -> toSourceString
     1:2:java.lang.String toString():596:597 -> toString
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1209:1210 -> u
-    1:1:java.util.Map getParameterInfo():591:591 -> v
-    1:2:boolean hasAnnotation():1190:1191 -> w
-    1:2:boolean hasClassFileVersion():652:653 -> x
-    1:1:boolean hasCode():632:632 -> y
-    1:1:boolean hasParameterInfo():587:587 -> z
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1168:1168 -> u
+    1:1:com.android.tools.r8.kotlin.KotlinMemberInfo getKotlinMemberInfo():396:396 -> v
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1214:1218 -> w
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1209:1210 -> x
+    1:1:java.util.Map getParameterInfo():591:591 -> y
+    1:2:boolean hasAnnotation():1190:1191 -> z
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.U$a:
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.U$b:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
@@ -17260,28 +17192,28 @@
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> g
-    1:1:void <clinit>():1257:1257 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1257:1257 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1257:1257 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1271:1271 -> <init>
-    4:22:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1274:1292 -> <init>
-    23:23:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1288:1288 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1257:1257 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1297:1297 -> a
-    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1306:1325 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1301:1301 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1325 -> a
-    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1328:1330 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1301:1301 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1328 -> a
-    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1350:1352 -> a
-    31:31:void setCode(com.android.tools.r8.graph.Code):1358:1358 -> a
-    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1362:1367 -> b
-    7:20:com.android.tools.r8.graph.DexEncodedMethod build():1366:1379 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1335:1335 -> c
-    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():246:246 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1335 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1340:1344 -> d
+    1:1:void <clinit>():1253:1253 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1253:1253 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1253:1253 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1267:1267 -> <init>
+    4:22:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1270:1288 -> <init>
+    23:23:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1284:1284 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1253:1253 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1293:1293 -> a
+    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1302:1321 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1297:1297 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1321 -> a
+    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1324:1326 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1297:1297 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1324 -> a
+    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1346:1348 -> a
+    31:31:void setCode(com.android.tools.r8.graph.Code):1354:1354 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1358:1363 -> b
+    7:20:com.android.tools.r8.graph.DexEncodedMethod build():1362:1375 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1331:1331 -> c
+    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():250:250 -> c
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1331 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1336:1340 -> d
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.U$c:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_NEST -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> g
@@ -17348,393 +17280,395 @@
     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.X:
-    com.android.tools.r8.graph.DexString getFieldName -> A0
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> A0
     com.android.tools.r8.graph.DexString unboxIntMethodName -> Q
-    com.android.tools.r8.graph.DexString iterableDescriptor -> b1
-    com.android.tools.r8.graph.DexType fieldType -> F2
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> g3
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> G3
+    com.android.tools.r8.graph.DexString collectionsDescriptor -> b1
+    com.android.tools.r8.graph.DexType classLoaderType -> F2
+    com.android.tools.r8.graph.DexType streamType -> g3
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
-    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> I0
-    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> j1
-    com.android.tools.r8.graph.DexString ordinalMethodName -> r0
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> I0
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> j1
+    com.android.tools.r8.graph.DexString finalizeMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    com.android.tools.r8.graph.DexString thisName -> R1
-    com.android.tools.r8.graph.DexType nullValueType -> x4
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> R1
     java.util.Map fields -> c
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> W3
-    com.android.tools.r8.graph.DexType annotationType -> w2
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> s3
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> K3
-    java.util.Map libraryMethodsWithoutSideEffects -> s4
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> z0
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> D3
-    com.android.tools.r8.graph.DexType annotationInnerClass -> O3
-    com.android.tools.r8.graph.DexType charSequenceType -> o2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> W3
+    com.android.tools.r8.graph.DexType charArrayType -> V1
+    com.android.tools.r8.graph.DexType enumType -> w2
+    com.android.tools.r8.graph.DexString getTypeNameName -> z0
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> O3
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> p4
+    com.android.tools.r8.graph.DexType boxedNumberType -> o2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> a0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> R
-    com.android.tools.r8.graph.DexType externalizableType -> h4
-    com.android.tools.r8.graph.DexType boxedByteType -> g2
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> J3
-    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> I1
+    com.android.tools.r8.graph.DexType serializableType -> h4
+    com.android.tools.r8.graph.DexType boxedBooleanType -> g2
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> I1
+    java.util.Set libraryTypesAssumedToBePresent -> w4
     com.android.tools.r8.graph.DexString trimName -> i0
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> Q1
-    com.android.tools.r8.graph.DexString classDescriptor -> Q0
-    com.android.tools.r8.graph.DexString collectionDescriptor -> r1
+    boolean $assertionsDisabled -> C4
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> G3
+    com.android.tools.r8.graph.DexString constructorMethodName -> Q1
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> Q0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> C3
     java.util.Map protos -> d
-    com.android.tools.r8.graph.DexType comparatorType -> W2
+    com.android.tools.r8.graph.DexType collectionType -> W2
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    com.android.tools.r8.graph.DexString annotationDescriptor -> Y0
-    com.android.tools.r8.graph.DexString optionalIntDescriptor -> z1
-    com.android.tools.r8.graph.DexType proxyType -> O2
-    com.android.tools.r8.graph.DexString optionalLongDescriptor -> A1
+    com.android.tools.r8.graph.DexString enumDescriptor -> Y0
+    com.android.tools.r8.graph.DexString optionalDoubleDescriptor -> z1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> O2
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> p3
+    com.android.tools.r8.graph.DexString optionalIntDescriptor -> A1
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexType streamType -> f3
-    com.android.tools.r8.graph.DexString methodTypeDescriptor -> i1
-    com.android.tools.r8.graph.DexType classLoaderType -> E2
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> H0
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> P0
-    com.android.tools.r8.graph.DexString mapEntryDescriptor -> q1
-    com.android.tools.r8.graph.DexString finalizeMethodName -> q0
-    com.android.tools.r8.graph.DexType charArrayType -> U1
-    com.android.tools.r8.graph.DexType enumType -> v2
+    com.android.tools.r8.graph.DexType optionalLongType -> f3
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> H3
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> i1
+    com.android.tools.r8.graph.DexType classType -> E2
+    com.android.tools.r8.graph.DexString invokeMethodName -> H0
+    com.android.tools.r8.graph.DexString objectDescriptor -> P0
+    com.android.tools.r8.graph.DexString mapDescriptor -> q1
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> r4
+    com.android.tools.r8.graph.DexString getClassMethodName -> q0
+    com.android.tools.r8.graph.DexType classArrayType -> v2
     com.android.tools.r8.graph.DexString descriptorSeparator -> C
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> V3
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> J3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> V3
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> t3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> g
-    com.android.tools.r8.graph.DexString getTypeNameName -> y0
-    com.android.tools.r8.graph.DexType boxedNumberType -> n2
+    com.android.tools.r8.graph.DexString getSimpleNameName -> y0
+    com.android.tools.r8.graph.DexType boxedShortType -> n2
     java.util.Map methods -> e
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> z3
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> N3
-    com.android.tools.r8.graph.DexString collectionsDescriptor -> a1
-    com.android.tools.r8.graph.DexType boxedBooleanType -> f2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> N3
+    com.android.tools.r8.graph.DexString objectsDescriptor -> a1
+    com.android.tools.r8.graph.DexType voidType -> f2
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
-    com.android.tools.r8.graph.DexType serializableType -> g4
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> I3
+    com.android.tools.r8.graph.DexType enumerationType -> g4
     com.android.tools.r8.graph.DexString substringName -> h0
-    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> H1
-    java.util.Set libraryClassesWithoutStaticInitialization -> v4
-    com.android.tools.r8.graph.DexString getClassMethodName -> p0
-    com.android.tools.r8.graph.DexString constructorMethodName -> P1
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> B3
-    com.android.tools.r8.graph.DexType collectionType -> V2
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> H1
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> A3
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> v4
+    com.android.tools.r8.graph.DexString initMethodName -> p0
+    com.android.tools.r8.graph.DexString newUpdaterName -> P1
+    com.android.tools.r8.graph.DexType mapEntryType -> V2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> D
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> k4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> h
-    com.android.tools.r8.graph.DexString enumDescriptor -> X0
-    com.android.tools.r8.graph.DexString optionalDoubleDescriptor -> y1
-    com.android.tools.r8.graph.DexType invocationHandlerType -> N2
-    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> o3
+    com.android.tools.r8.graph.DexString methodDescriptor -> X0
+    com.android.tools.r8.graph.DexString optionalDescriptor -> y1
+    com.android.tools.r8.graph.DexType methodTypeType -> N2
+    com.android.tools.r8.graph.DexType npeType -> o3
     java.util.Map methodHandles -> f
-    com.android.tools.r8.graph.DexString getMethodName -> C0
-    com.android.tools.r8.graph.DexString strictMathDescriptor -> d1
-    com.android.tools.r8.graph.DexType optionalLongType -> e3
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> C0
+    com.android.tools.r8.graph.DexString mathDescriptor -> d1
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> y3
+    com.android.tools.r8.graph.DexType optionalIntType -> e3
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType classType -> D2
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> m4
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> K0
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> l1
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> D2
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> m4
+    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> K0
+    com.android.tools.r8.graph.DexString proxyDescriptor -> l1
+    java.util.Map libraryMethodsWithoutSideEffects -> u4
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> t0
-    java.util.Set libraryMethodsReturningReceiver -> q4
-    com.android.tools.r8.graph.DexString charArrayDescriptor -> T1
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> I3
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> U3
-    com.android.tools.r8.graph.DexType classArrayType -> u2
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> u3
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> M3
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> n4
+    com.android.tools.r8.graph.DexString nameMethodName -> t0
+    com.android.tools.r8.graph.DexString enumValuesFieldName -> T1
+    com.android.tools.r8.graph.DexType annotationThrows -> U3
+    com.android.tools.r8.graph.DexType objectArrayType -> u2
+    com.android.tools.r8.graph.DexType annotationDefault -> M3
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> M
-    com.android.tools.r8.graph.DexType boxedShortType -> m2
-    com.android.tools.r8.graph.DexString arraysDescriptor -> C1
+    com.android.tools.r8.graph.DexType boxedLongType -> m2
+    com.android.tools.r8.graph.DexString streamDescriptor -> C1
     com.android.tools.r8.graph.DexString indexOfMethodName -> c0
-    com.android.tools.r8.graph.DexType enumerationType -> f4
-    com.android.tools.r8.graph.DexType voidType -> e2
-    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> K1
-    com.android.tools.r8.graph.DexString toStringMethodName -> k0
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> S0
-    com.android.tools.r8.graph.DexString callableDescriptor -> t1
-    com.android.tools.r8.graph.DexType mapEntryType -> U2
-    com.android.tools.r8.graph.DexType methodTypeType -> M2
-    com.android.tools.r8.graph.DexType npeType -> n3
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> k4
+    com.android.tools.r8.graph.DexType listIteratorType -> f4
+    com.android.tools.r8.graph.DexType shortType -> e2
+    com.android.tools.r8.graph.DexString npeDescriptor -> K1
+    com.android.tools.r8.graph.DexString valuesMethodName -> k0
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> S0
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> t1
+    com.android.tools.r8.graph.DexType mapType -> U2
+    com.android.tools.r8.graph.DexType methodHandleType -> M2
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> n3
     com.android.tools.r8.graph.DexString unboxByteMethodName -> N
-    com.android.tools.r8.graph.DexString mathDescriptor -> c1
-    com.android.tools.r8.graph.DexString getDeclaredFieldName -> B0
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> x3
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> C2
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> l4
-    com.android.tools.r8.graph.DexType optionalIntType -> d3
-    com.android.tools.r8.graph.DexString proxyDescriptor -> k1
-    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> J0
+    com.android.tools.r8.graph.DexString iterableDescriptor -> c1
+    com.android.tools.r8.graph.DexString getFieldName -> B0
+    com.android.tools.r8.graph.DexType strictMathType -> C2
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> x3
+    com.android.tools.r8.graph.DexType optionalDoubleType -> d3
+    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> k1
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> J0
     java.util.Map strings -> a
-    com.android.tools.r8.graph.DexString enumValuesFieldName -> S1
-    com.android.tools.r8.graph.DexString nameMethodName -> s0
-    com.android.tools.r8.graph.DexType objectArrayType -> t2
-    com.android.tools.r8.graph.DexType annotationThrows -> T3
-    com.android.tools.r8.graph.DexType boxedLongType -> l2
+    com.android.tools.r8.graph.DexString thisName -> S1
+    com.android.tools.r8.graph.DexString ordinalMethodName -> s0
+    com.android.tools.r8.graph.DexType objectType -> t2
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> T3
+    com.android.tools.r8.kotlin.Kotlin kotlin -> F3
+    com.android.tools.r8.graph.DexType boxedIntType -> l2
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> v3
     com.android.tools.r8.graph.DexString unboxCharMethodName -> O
-    com.android.tools.r8.graph.DexType annotationDefault -> L3
     com.android.tools.r8.graph.DexString unboxShortMethodName -> P
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> b0
-    com.android.tools.r8.graph.DexString streamDescriptor -> B1
-    com.android.tools.r8.graph.DexType shortType -> d2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> t3
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> j4
-    com.android.tools.r8.graph.DexType listIteratorType -> e4
+    com.android.tools.r8.graph.DexString optionalLongDescriptor -> B1
+    com.android.tools.r8.graph.DexType longType -> d2
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> K3
+    com.android.tools.r8.graph.DexType iteratorType -> e4
     com.android.tools.r8.graph.DexString valueOfMethodName -> j0
-    com.android.tools.r8.graph.DexString npeDescriptor -> J1
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> R0
-    com.android.tools.r8.graph.DexString comparatorDescriptor -> s1
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> J1
+    java.util.Set libraryClassesWithoutStaticInitialization -> x4
+    com.android.tools.r8.graph.DexString classDescriptor -> R0
+    com.android.tools.r8.graph.DexString collectionDescriptor -> s1
     java.util.Map types -> b
-    com.android.tools.r8.graph.DexType mapType -> T2
-    boolean skipNameValidationForTesting -> w4
-    com.android.tools.r8.graph.DexString objectsDescriptor -> Z0
-    com.android.tools.r8.graph.DexType methodHandleType -> L2
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> m3
-    com.android.tools.r8.graph.DexString newInstanceName -> E0
-    com.android.tools.r8.graph.DexString stringBufferDescriptor -> f1
-    com.android.tools.r8.graph.DexType strictMathType -> B2
-    com.android.tools.r8.graph.DexType optionalDoubleType -> c3
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> w3
+    com.android.tools.r8.graph.DexType setType -> T2
+    com.android.tools.r8.graph.DexString annotationDescriptor -> Z0
+    com.android.tools.r8.graph.DexType varHandleType -> L2
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> m3
+    com.android.tools.r8.graph.DexString getDeclaredMethodName -> E0
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> f1
+    com.android.tools.r8.graph.DexType mathType -> B2
+    com.android.tools.r8.graph.DexType optionalType -> c3
     com.android.tools.r8.graph.DexString endsWithMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> C3
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> o4
-    com.android.tools.r8.graph.DexString stringDescriptor -> M0
-    com.android.tools.r8.graph.DexString listDescriptor -> n1
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> v3
-    com.android.tools.r8.graph.DexType doubleType -> Z1
-    com.android.tools.r8.graph.DexString getNameName -> v0
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> V1
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> S3
-    com.android.tools.r8.graph.DexType objectType -> s2
-    com.android.tools.r8.kotlin.Kotlin kotlin -> E3
+    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> o4
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> M0
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> n1
+    com.android.tools.r8.graph.DexType charType -> Z1
+    com.android.tools.r8.graph.DexString forNameMethodName -> v0
+    com.android.tools.r8.graph.DexType annotationSignature -> S3
+    com.android.tools.r8.graph.DexType stringArrayType -> s2
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> I
-    com.android.tools.r8.graph.DexType boxedIntType -> k2
-    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> E1
+    com.android.tools.r8.graph.DexType boxedFloatType -> k2
+    com.android.tools.r8.graph.DexString throwableDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToMethodName -> e0
-    com.android.tools.r8.graph.DexType iteratorType -> d4
-    com.android.tools.r8.graph.DexType longType -> c2
+    com.android.tools.r8.graph.DexType lookupType -> d4
+    com.android.tools.r8.graph.DexType intType -> c2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> u3
     com.android.tools.r8.graph.DexString equalsMethodName -> Z
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> M1
-    com.android.tools.r8.graph.DexString convertMethodName -> m0
-    com.android.tools.r8.graph.DexString constructorDescriptor -> U0
-    com.android.tools.r8.graph.DexString consumerDescriptor -> v1
-    com.android.tools.r8.graph.DexType setType -> S2
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> M1
+    java.util.Set libraryMethodsReturningReceiver -> s4
+    com.android.tools.r8.graph.DexString internMethodName -> m0
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> U0
+    com.android.tools.r8.graph.DexString supplierDescriptor -> v1
+    com.android.tools.r8.graph.DexType listType -> S2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> J
-    com.android.tools.r8.graph.DexType varHandleType -> K2
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> l3
-    com.android.tools.r8.graph.DexType icceType -> j3
-    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> e1
-    com.android.tools.r8.graph.DexType stringBuilderType -> I2
-    com.android.tools.r8.graph.DexString getDeclaredMethodName -> D0
-    com.android.tools.r8.graph.DexType optionalType -> b3
-    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> L0
-    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> m1
-    com.android.tools.r8.graph.DexType mathType -> A2
-    com.android.tools.r8.graph.DexType charType -> Y1
-    com.android.tools.r8.graph.DexType iterableType -> z2
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> Z3
-    com.android.tools.r8.graph.DexString forNameMethodName -> u0
-    com.android.tools.r8.graph.DexType stringArrayType -> r2
-    com.android.tools.r8.graph.DexType annotationSignature -> R3
+    com.android.tools.r8.graph.DexType stringBufferType -> K2
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> l3
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> j3
+    com.android.tools.r8.graph.DexString strictMathDescriptor -> e1
+    com.android.tools.r8.graph.DexType autoCloseableType -> I2
+    com.android.tools.r8.graph.DexString getMethodName -> D0
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> n4
+    com.android.tools.r8.graph.DexType runnableType -> b3
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> L0
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> m1
+    com.android.tools.r8.graph.DexType iterableType -> A2
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> D3
+    com.android.tools.r8.graph.DexType byteType -> Y1
+    com.android.tools.r8.graph.DexType collectionsType -> z2
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> w3
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> Z3
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> U1
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> u0
+    com.android.tools.r8.graph.DexType stringType -> r2
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> R3
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> K
-    com.android.tools.r8.graph.DexType boxedFloatType -> j2
+    com.android.tools.r8.graph.DexType boxedDoubleType -> j2
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> d0
-    com.android.tools.r8.graph.DexString throwableDescriptor -> D1
+    com.android.tools.r8.graph.DexString arraysDescriptor -> D1
     java.util.Map setFiles -> n
-    com.android.tools.r8.graph.DexType intType -> b2
-    com.android.tools.r8.graph.DexType lookupType -> c4
-    com.android.tools.r8.graph.DexString internMethodName -> l0
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> L1
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> p3
-    java.util.Set libraryMethodsReturningNonNull -> r4
-    com.android.tools.r8.graph.DexType consumerType -> Z2
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> T0
-    com.android.tools.r8.graph.DexString supplierDescriptor -> u1
-    com.android.tools.r8.graph.DexType listType -> R2
+    com.android.tools.r8.graph.DexType floatType -> b2
+    com.android.tools.r8.graph.DexType callSiteType -> c4
+    com.android.tools.r8.graph.DexString toStringMethodName -> l0
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> L1
+    com.android.tools.r8.graph.DexType supplierType -> Z2
+    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> s3
+    boolean skipNameValidationForTesting -> y4
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> T0
+    com.android.tools.r8.graph.DexString callableDescriptor -> u1
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> R2
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> L
-    com.android.tools.r8.graph.DexType stringBufferType -> J2
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> k3
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> i3
-    com.android.tools.r8.graph.DexType autoCloseableType -> H2
+    com.android.tools.r8.graph.DexType stringBuilderType -> J2
+    com.android.tools.r8.graph.DexType icceType -> k3
+    com.android.tools.r8.graph.DexType throwableType -> i3
+    com.android.tools.r8.graph.DexType methodType -> H2
     com.android.tools.r8.graph.DexString isEmptyMethodName -> U
     com.android.tools.r8.graph.DexString charDescriptor -> v
-    com.android.tools.r8.graph.DexString invokeMethodName -> G0
-    com.android.tools.r8.graph.DexString methodHandleDescriptor -> h1
-    com.android.tools.r8.graph.DexType runnableType -> a3
-    com.android.tools.r8.graph.DexString objectDescriptor -> O0
-    com.android.tools.r8.graph.DexString mapDescriptor -> p1
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> Y3
-    com.android.tools.r8.graph.DexType byteType -> X1
-    com.android.tools.r8.graph.DexType collectionsType -> y2
+    com.android.tools.r8.graph.DexString assertionsDisabled -> G0
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> h1
+    com.android.tools.r8.graph.DexType consumerType -> a3
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> B3
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> q4
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> O0
+    com.android.tools.r8.graph.DexString setDescriptor -> p1
+    com.android.tools.r8.graph.DexType nullValueType -> z4
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> Y3
+    com.android.tools.r8.graph.DexType booleanType -> X1
+    com.android.tools.r8.graph.DexType objectsType -> y2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> i
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> E
-    com.android.tools.r8.graph.DexString getSimpleNameName -> x0
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> Q3
-    com.android.tools.r8.graph.DexType stringType -> q2
-    com.android.tools.r8.graph.DexType boxedDoubleType -> i2
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> H3
-    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> G1
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> x0
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> Q3
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> q2
+    com.android.tools.r8.graph.DexString unknownTypeName -> A4
+    com.android.tools.r8.graph.DexType comparableType -> j4
+    com.android.tools.r8.graph.DexType boxedCharType -> i2
+    com.android.tools.r8.graph.DexString icceDescriptor -> G1
     com.android.tools.r8.graph.DexString lengthMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString cloneMethodName -> g0
-    com.android.tools.r8.graph.DexType callSiteType -> b4
-    boolean $assertionsDisabled -> A4
-    com.android.tools.r8.graph.DexType floatType -> a2
-    com.android.tools.r8.graph.DexString newUpdaterName -> O1
-    java.util.Set libraryTypesAssumedToBePresent -> u4
-    com.android.tools.r8.graph.DexString initMethodName -> o0
-    com.android.tools.r8.graph.DexType supplierType -> Y2
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> q3
+    com.android.tools.r8.graph.DexType metafactoryType -> b4
+    com.android.tools.r8.graph.DexType doubleType -> a2
+    java.util.IdentityHashMap internalSentinels -> B4
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> O1
+    com.android.tools.r8.graph.DexString wrapperFieldName -> o0
+    com.android.tools.r8.graph.DexType callableType -> Y2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> q3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> j
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> y3
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> l4
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> F
-    com.android.tools.r8.graph.DexString methodDescriptor -> W0
-    com.android.tools.r8.graph.DexString optionalDescriptor -> x1
-    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> r3
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> Q2
-    com.android.tools.r8.graph.DexType methodType -> G2
-    com.android.tools.r8.graph.DexType throwableType -> h3
-    com.android.tools.r8.graph.DexString varHandleDescriptor -> g1
-    com.android.tools.r8.graph.DexString assertionsDisabled -> F0
+    com.android.tools.r8.graph.DexString fieldDescriptor -> W0
+    com.android.tools.r8.graph.DexString runnableDescriptor -> x1
+    com.android.tools.r8.graph.DexType serviceLoaderType -> Q2
+    com.android.tools.r8.graph.DexType fieldType -> G2
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> h3
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> g1
+    com.android.tools.r8.graph.DexString newInstanceName -> F0
     com.android.tools.r8.graph.DexString containsMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> p4
-    com.android.tools.r8.graph.DexString stringArrayDescriptor -> N0
-    com.android.tools.r8.graph.DexString setDescriptor -> o1
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> A3
+    com.android.tools.r8.graph.DexString stringDescriptor -> N0
+    com.android.tools.r8.graph.DexString listDescriptor -> o1
     boolean sorted -> s
-    com.android.tools.r8.graph.DexType booleanType -> W1
-    com.android.tools.r8.graph.DexType objectsType -> x2
+    com.android.tools.r8.graph.DexType annotationType -> x2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> k
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> X3
-    com.android.tools.r8.graph.DexString unknownTypeName -> y4
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> X3
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> W1
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> G
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> w0
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> p2
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> P3
-    com.android.tools.r8.graph.DexType boxedCharType -> h2
-    java.util.IdentityHashMap internalSentinels -> z4
-    com.android.tools.r8.graph.DexType comparableType -> i4
+    com.android.tools.r8.graph.DexString getNameName -> w0
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> L3
+    com.android.tools.r8.graph.DexType charSequenceType -> p2
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> E3
+    com.android.tools.r8.graph.DexType annotationInnerClass -> P3
+    com.android.tools.r8.graph.DexType boxedByteType -> h2
+    com.android.tools.r8.graph.DexType externalizableType -> i4
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> f0
-    com.android.tools.r8.graph.DexString icceDescriptor -> F1
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> F1
     com.android.tools.r8.graph.DexString startsWithMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> F3
-    com.android.tools.r8.graph.DexType metafactoryType -> a4
-    com.android.tools.r8.graph.DexString wrapperFieldName -> n0
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> N1
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> t4
-    com.android.tools.r8.graph.DexType callableType -> X2
-    com.android.tools.r8.graph.DexString fieldDescriptor -> V0
-    com.android.tools.r8.graph.DexString runnableDescriptor -> w1
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> a4
+    com.android.tools.r8.graph.DexString convertMethodName -> n0
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> N1
+    java.util.Set libraryMethodsReturningNonNull -> t4
+    com.android.tools.r8.graph.DexType comparatorType -> X2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> r3
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> z3
+    com.android.tools.r8.graph.DexString constructorDescriptor -> V0
+    com.android.tools.r8.graph.DexString consumerDescriptor -> w1
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> H
-    com.android.tools.r8.graph.DexType serviceLoaderType -> P2
+    com.android.tools.r8.graph.DexType proxyType -> P2
     1:41:void <clinit>():59:99 -> <clinit>
     1:1:void <init>():103:103 -> <init>
-    2:377:void <init>():63:438 -> <init>
-    378:426:void <init>():428:476 -> <init>
-    427:443:void <init>():466:482 -> <init>
-    444:462:void <init>():479:497 -> <init>
-    463:483:void <init>():488:508 -> <init>
-    484:517:void <init>():501:534 -> <init>
-    518:522:void <init>():533:537 -> <init>
-    523:526:void <init>():536:539 -> <init>
-    527:565:void <init>():529:567 -> <init>
-    566:568:void <init>():104:106 -> <init>
-    569:569:void <init>():105:105 -> <init>
+    2:378:void <init>():63:439 -> <init>
+    379:427:void <init>():429:477 -> <init>
+    428:444:void <init>():467:483 -> <init>
+    445:466:void <init>():480:501 -> <init>
+    467:487:void <init>():492:512 -> <init>
+    488:521:void <init>():505:538 -> <init>
+    522:526:void <init>():537:541 -> <init>
+    527:530:void <init>():540:543 -> <init>
+    531:569:void <init>():533:571 -> <init>
+    570:572:void <init>():104:106 -> <init>
+    573:573:void <init>():105:105 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$2(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$2000(com.android.tools.r8.graph.DexItemFactory):59:59 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):110:110 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):441:442 -> a
-    5:16:java.util.Set boxedValueOfMethods():451:462 -> a
-    17:19:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):454:456 -> a
-    20:20:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):544:544 -> a
-    21:21:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):544:544 -> a
-    22:22:void setSkipNameValidationForTesting(boolean):570:570 -> a
-    23:24:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1201:1202 -> a
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):442:443 -> a
+    5:16:java.util.Set boxedValueOfMethods():452:463 -> a
+    17:19:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):455:457 -> a
+    20:20:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):548:548 -> a
+    21:21:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):548:548 -> a
+    22:22:void setSkipNameValidationForTesting(boolean):574:574 -> a
+    23:24:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1229:1230 -> a
     25:25:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):110:110 -> a
-    25:25:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1202 -> a
-    26:27:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1202:1203 -> a
-    28:29:com.android.tools.r8.graph.DexString createString(int,byte[]):1208:1209 -> a
-    30:31:com.android.tools.r8.graph.DexString createString(java.lang.String):1213:1214 -> a
-    32:33:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1262:1263 -> a
-    34:36:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1267:1269 -> a
-    37:37:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1273:1273 -> a
-    38:40:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1277:1279 -> a
-    41:44:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1283:1286 -> a
-    45:50:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1352:1357 -> a
-    45:50:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1287 -> a
-    51:51:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1284:1284 -> a
-    52:52:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1291:1291 -> a
-    53:55:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1295:1297 -> a
-    56:59:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1301:1304 -> a
-    60:62:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1303:1305 -> a
-    63:67:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1318:1322 -> a
-    68:77:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1339:1348 -> a
-    68:77:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1322 -> a
-    78:84:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1323:1329 -> a
-    85:89:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1328:1332 -> a
-    90:92:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1361:1363 -> a
-    93:93:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1367:1367 -> a
-    94:96:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1374:1376 -> a
-    97:98:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1385:1386 -> a
-    99:108:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1394:1403 -> a
-    109:111:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1407:1409 -> a
-    112:114:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1445:1447 -> a
-    115:117:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1452:1454 -> a
-    118:118:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1462:1462 -> a
-    119:126:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1495:1502 -> a
-    127:155:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1501:1529 -> a
-    156:164:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1509:1517 -> a
-    165:176:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1516:1527 -> a
-    177:178:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1534:1535 -> a
-    179:180:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1538:1539 -> a
-    181:185:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1546:1550 -> a
-    186:186:int lambda$assignSortedIndices$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1547:1547 -> a
-    187:193:void sort(com.android.tools.r8.naming.NamingLens):1555:1561 -> a
-    194:194:void forAllTypes(java.util.function.Consumer):1578:1578 -> a
-    1:1:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1218:1218 -> b
-    2:8:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1240:1246 -> b
-    9:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1245:1247 -> b
+    25:25:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1230 -> a
+    26:27:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1230:1231 -> a
+    28:29:com.android.tools.r8.graph.DexString createString(int,byte[]):1236:1237 -> a
+    30:31:com.android.tools.r8.graph.DexString createString(java.lang.String):1241:1242 -> a
+    32:33:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1290:1291 -> a
+    34:36: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):1295:1297 -> a
+    37:37:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1301:1301 -> a
+    38:40: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):1305:1307 -> a
+    41:44:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1311:1314 -> a
+    45:50:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1380:1385 -> a
+    45:50:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1315 -> a
+    51:51:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1312:1312 -> a
+    52:52:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1319:1319 -> a
+    53:55:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1323:1325 -> a
+    56:59:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1329:1332 -> a
+    60:62:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1331:1333 -> a
+    63:67:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1346:1350 -> a
+    68:77:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1367:1376 -> a
+    68:77:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1350 -> a
+    78:84:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1351:1357 -> a
+    85:89:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1356:1360 -> a
+    90:92: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):1389:1391 -> a
+    93:93:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1395:1395 -> a
+    94:96:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1402:1404 -> a
+    97:98:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1413:1414 -> a
+    99:108:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1422:1431 -> a
+    109:111:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1435:1437 -> a
+    112:114:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1473:1475 -> a
+    115:117:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1480:1482 -> a
+    118:118:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1490:1490 -> a
+    119:126: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):1523:1530 -> a
+    127:155: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):1529:1557 -> a
+    156:164:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1537:1545 -> a
+    165:176:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1544:1555 -> a
+    177:178:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1562:1563 -> a
+    179:180:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1566:1567 -> a
+    181:185:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1574:1578 -> a
+    186:186:int lambda$assignSortedIndices$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1575:1575 -> a
+    187:193:void sort(com.android.tools.r8.naming.NamingLens):1583:1589 -> a
+    194:194:void forAllTypes(java.util.function.Consumer):1606:1606 -> a
+    1:1:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1246:1246 -> b
+    2:8:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1268:1274 -> b
+    9:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1273:1275 -> b
     12:12:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):110:110 -> b
-    12:12:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1247 -> b
-    13:14:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1247:1248 -> b
-    15:15:com.android.tools.r8.graph.DexType createType(java.lang.String):1254:1254 -> b
-    16:18:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1413:1415 -> b
-    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1458:1458 -> b
-    20:22:void clearTypeLatticeElementsCache():1466:1468 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):578:578 -> c
-    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1222:1222 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1258:1258 -> c
-    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1419:1421 -> c
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1437:1437 -> c
-    1:3:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1425:1427 -> d
-    4:4:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1441:1441 -> d
-    1:5:java.util.List extractMarkers():1229:1233 -> e
-    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1431:1433 -> e
-    1:1:boolean getSkipNameValidationForTesting():574:574 -> f
-    1:10:void resetSortedIndices():1565:1574 -> g
-    1:3:boolean verifyNoCachedTypeLatticeElements():1472:1474 -> h
+    12:12:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1275 -> b
+    13:14:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1275:1276 -> b
+    15:15:com.android.tools.r8.graph.DexType createType(java.lang.String):1282:1282 -> b
+    16:18:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1441:1443 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1486:1486 -> b
+    20:22:void clearTypeLatticeElementsCache():1494:1496 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):582:582 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1250:1250 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1286:1286 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1447:1449 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1465:1465 -> c
+    1:3:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1453:1455 -> d
+    4:4:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1469:1469 -> d
+    1:5:java.util.List extractMarkers():1257:1261 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1459:1461 -> e
+    1:1:boolean getSkipNameValidationForTesting():578:578 -> f
+    1:10:void resetSortedIndices():1593:1602 -> g
+    1:3:boolean verifyNoCachedTypeLatticeElements():1500:1502 -> h
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.X$a:
 com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.X$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):642:642 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):646:651 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):646:646 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):650:655 -> <init>
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.X$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):875:875 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):881:900 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):904:904 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):903:903 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):909:928 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):932:932 -> a
 com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.X$d:
     com.android.tools.r8.graph.DexItemFactory this$0 -> f
     com.android.tools.r8.graph.DexField TRUE -> b
@@ -17742,9 +17676,9 @@
     com.android.tools.r8.graph.DexMethod valueOf -> e
     com.android.tools.r8.graph.DexField TYPE -> c
     com.android.tools.r8.graph.DexMethod booleanValue -> d
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):581:581 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):592:592 -> <init>
-    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):583:590 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):585:585 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):596:596 -> <init>
+    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):587:594 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.X$e:
     com.android.tools.r8.graph.DexMethod newInstance -> m
     com.android.tools.r8.graph.DexMethod getDeclaredMethod -> l
@@ -17761,52 +17695,57 @@
     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):685:685 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):703:742 -> <init>
-    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$ClassMethods):685:685 -> a
-    2:2:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):746:746 -> a
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):750:750 -> b
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):754:754 -> c
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):689:689 -> <init>
+    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):707:746 -> <init>
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$ClassMethods):689:689 -> a
+    2:2:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):750:750 -> a
+    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):754:754 -> b
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):758:758 -> c
 com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.X$f:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):758:758 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):762:764 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):762:762 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):766:768 -> <init>
 com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.X$g:
-    com.android.tools.r8.graph.DexItemFactory this$0 -> g
-    com.android.tools.r8.graph.DexMethod finalize -> f
-    com.android.tools.r8.graph.DexMethod constructor -> e
+    boolean $assertionsDisabled -> i
+    com.android.tools.r8.graph.DexItemFactory this$0 -> h
+    com.android.tools.r8.graph.DexMethod finalize -> g
+    com.android.tools.r8.graph.DexMethod constructor -> f
+    com.android.tools.r8.graph.DexMethod compareTo -> e
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod name -> c
     com.android.tools.r8.graph.DexMethod ordinal -> b
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):772:772 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):784:784 -> <init>
-    3:28:void <init>(com.android.tools.r8.graph.DexItemFactory):779:804 -> <init>
+    1:1:void <clinit>():776:776 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):776:776 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):789:789 -> <init>
+    3:34:void <init>(com.android.tools.r8.graph.DexItemFactory):784:815 -> <init>
+    1:4:boolean isValueOfMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):831:834 -> a
+    1:4:boolean isValuesMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):823:826 -> b
 com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.X$h:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):605:605 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):609:613 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):611:611 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):609:609 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):613:617 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):615:615 -> <init>
 com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.graph.X$i:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):595:595 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):599:601 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):600:600 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):599:599 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):603:605 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):604:604 -> <init>
 com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.X$j:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):812:812 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):816:818 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):840:840 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):844:846 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.graph.X$k:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):656:656 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):663:670 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):660:660 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):667:674 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.X$l:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):675:675 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):679:681 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):680:680 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):679:679 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):683:685 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):684:684 -> <init>
 com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.X$m:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
@@ -17815,9 +17754,9 @@
     java.util.Set varHandleCompareAndSetMethods -> f
     com.android.tools.r8.graph.DexProto signature -> a
     com.android.tools.r8.graph.DexProto setSignature -> b
-    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1089:1124 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1132:1142 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1149:1154 -> a
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1117:1152 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1160:1170 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1177:1182 -> a
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.X$n:
     com.android.tools.r8.graph.DexField floatTYPE -> f
     com.android.tools.r8.graph.DexField longTYPE -> e
@@ -17827,24 +17766,24 @@
     com.android.tools.r8.graph.DexField intTYPE -> d
     com.android.tools.r8.graph.DexField shortTYPE -> c
     java.util.Map boxedFieldTypeToPrimitiveType -> h
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):832:832 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):844:863 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):867:867 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):860:860 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):872:891 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):895:895 -> a
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.X$o:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1158:1158 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1162:1167 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1164:1164 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1186:1186 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1190:1195 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1192:1192 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.X$p:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1171:1171 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1178:1184 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1182:1190 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1187:1192 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1196:1196 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1199:1199 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1206:1212 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1210:1218 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1215:1220 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1224:1224 -> a
 com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.X$q:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
@@ -17867,13 +17806,13 @@
     com.android.tools.r8.graph.DexMethod toString -> r
     com.android.tools.r8.graph.DexMethod stringConstructor -> q
     com.android.tools.r8.graph.DexMethod intConstructor -> p
-    1:1:void <clinit>():981:981 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):981:981 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1005:1049 -> <init>
-    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):981:981 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1054:1054 -> a
-    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1058:1084 -> a
-    1:1:java.util.Set access$1900(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):981:981 -> b
+    1:1:void <clinit>():1009:1009 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1009:1009 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1033:1077 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1009:1009 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1082:1082 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1086:1112 -> a
+    1:1:java.util.Set access$1900(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1009:1009 -> b
 com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.graph.X$r:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
@@ -17895,25 +17834,25 @@
     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):908:908 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):933:933 -> <init>
-    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):931:976 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):936:936 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):961:961 -> <init>
+    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):959:1004 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.X$s:
     com.android.tools.r8.graph.DexMethod initCause -> d
     com.android.tools.r8.graph.DexMethod getSuppressed -> c
     com.android.tools.r8.graph.DexMethod getMessage -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):619:619 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):626:628 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):627:630 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):629:636 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):634:634 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):623:623 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):630:632 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):631:634 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):633:640 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):638:638 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.Y:
     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>
-    boolean isLibraryClass() -> L
-    boolean isNotProgramClass() -> Q
+    boolean isLibraryClass() -> M
+    boolean isNotProgramClass() -> R
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):98:98 -> a
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:74 -> c
     2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():143:143 -> c
@@ -17924,10 +17863,10 @@
     6:6:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):75:75 -> c
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):82:82 -> collectIndexedItems
     1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):67:69 -> d
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> k
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> m
     1:1:java.lang.String toSourceString():92:92 -> toSourceString
     1:1:java.lang.String toString():87:87 -> toString
-    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> w
+    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> x
 com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.Z:
     com.android.tools.r8.graph.Descriptor item -> a
     com.android.tools.r8.graph.DexItem annotations -> b
@@ -18104,8 +18043,7 @@
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INTERFACE -> j
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_DIRECT -> i
     short value -> a
-    1:12:void <clinit>():18:29 -> <clinit>
-    13:13:void <clinit>():18:18 -> <clinit>
+    1:13:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(java.lang.String,int,short):33:34 -> <init>
     1:1:short getValue():38:38 -> a
     2:29:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):85:112 -> a
@@ -18170,12 +18108,8 @@
     2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):63:63 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,java.util.Collection):105:105 -> <init>
     4:94:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,java.util.Collection):37:127 -> <init>
-    boolean isNotProgramClass() -> Q
-    boolean isProgramClass() -> R
-    1:12:void computeStaticValues():330:341 -> X
-    13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):183:183 -> X
-    13:13:void computeStaticValues():341 -> X
-    14:16:void computeStaticValues():347:349 -> X
+    boolean isNotProgramClass() -> R
+    1:20:void computeStaticValues():330:349 -> X
     1:1:long getChecksum():524:524 -> Y
     1:2:int getInitialClassFileVersion():436:437 -> Z
     1:5:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):192:196 -> a
@@ -18196,7 +18130,7 @@
     4:6:void synchronizedCollectAll(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem[]):217:219 -> b
     7:7:java.util.Iterator lambda$asProgramClasses$2(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):483:483 -> b
     8:8:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):520:520 -> b
-    9:9:boolean com.android.tools.r8.graph.DexClass.isFinal():634:634 -> b
+    9:9:boolean com.android.tools.r8.graph.DexClass.isFinal():647:647 -> b
     9:9:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):238 -> b
     10:16:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):241:247 -> b
     1:1:java.util.Collection getSynthesizedFrom():178:178 -> b0
@@ -18217,6 +18151,7 @@
     11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):152 -> collectIndexedItems
     12:24:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):154:166 -> collectIndexedItems
     1:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):183:186 -> collectMixedSectionItems
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> d
     1:1:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):396:396 -> d
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> d
     2:2:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):397 -> d
@@ -18240,12 +18175,12 @@
     1:4:boolean hasOnlyInternalizableAnnotations():302:305 -> f0
     1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):417:417 -> g
     1:4:boolean isSorted():354:357 -> g0
+    boolean isProgramClass() -> h
     1:1:boolean originatesFromClassResource():135:135 -> h0
     1:1:boolean originatesFromDexResource():131:131 -> i0
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> l
     1:1:java.lang.String toSourceString():229:229 -> toSourceString
     1:1:java.lang.String toString():224:224 -> toString
-    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():273:273 -> w
+    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():273:273 -> x
 com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.c0$a:
     java.util.Iterator iterator -> b
     com.android.tools.r8.graph.DexProgramClass next -> a
@@ -18476,6 +18411,7 @@
     83:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):156:156 -> a
     84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):154:154 -> a
     com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> b
+    1:1:boolean isDefault(com.android.tools.r8.graph.DexType):183:183 -> b
     com.android.tools.r8.graph.DexValue$DexValueInt asDexValueInt() -> c
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):133:133 -> collectMixedSectionItems
     com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> d
@@ -18625,10 +18561,8 @@
     6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):681:681 -> a
     7:7:java.lang.Object asAsmEncodedObject():686:686 -> 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):692:692 -> a
-    9:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1049:1050 -> a
-    9: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):692 -> a
-    11:11:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1049:1049 -> a
-    11:11: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):692 -> a
+    9:11:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1053:1053 -> a
+    9:11: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):692 -> a
     1:2:boolean equals(java.lang.Object):705:706 -> equals
     1:1:java.lang.Object getBoxedValue():672:672 -> h
     1:1:int hashCode():697:697 -> hashCode
@@ -18673,10 +18607,8 @@
     6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):617:617 -> a
     7:7:java.lang.Object asAsmEncodedObject():622:622 -> 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):628:628 -> a
-    9:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1054:1055 -> a
-    9: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):628 -> a
-    11:11:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1054:1054 -> a
-    11:11: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):628 -> a
+    9:11:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1058:1058 -> a
+    9:11: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):628 -> a
     1:2:boolean equals(java.lang.Object):641:642 -> equals
     1:1:java.lang.Object getBoxedValue():608:608 -> h
     1:1:int hashCode():633:633 -> hashCode
@@ -18711,10 +18643,8 @@
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):556:556 -> a
     3:3:java.lang.Object asAsmEncodedObject():561:561 -> 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):585:585 -> a
-    5:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1068:1069 -> a
-    5: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):585 -> a
-    7:7:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1068:1068 -> 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 -> a
+    5:7:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1072:1072 -> a
+    5: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 -> a
     1:1:boolean equals(java.lang.Object):574:574 -> equals
     1:1:java.lang.Object getBoxedValue():551:551 -> h
     1:1:int hashCode():566:566 -> hashCode
@@ -18765,10 +18695,8 @@
     1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):127:127 -> 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):1129 -> a
-    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1092:1093 -> 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):1163 -> a
-    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1092:1092 -> 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):1163 -> a
+    2:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1096:1096 -> a
+    2: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):1163 -> a
     1:1:boolean equals(java.lang.Object):1152:1152 -> equals
     java.lang.Object getBoxedValue() -> h
     boolean mayHaveSideEffects() -> l
@@ -18923,26 +18851,26 @@
     1:4:java.lang.String toString():78:81 -> toString
 com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.l0:
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:1:void <init>(int,int):45:45 -> <init>
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> B
-    1:1:int getAsCfAccessFlags():73 -> B
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:1:void <init>(int,int):44:44 -> <init>
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> C
-    1:1:int getAsDexAccessFlags():78 -> C
-    1:1:boolean isEnum():103:103 -> D
-    1:1:boolean isTransient():95:95 -> E
-    1:1:boolean isVolatile():87:87 -> F
-    1:6:java.util.List getNames():22:27 -> b
-    1:6:java.util.List getPredicates():32:37 -> d
-    1:1:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):68:68 -> e
-    2:2:void <init>(int):41:41 -> e
-    2:2:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):68 -> e
-    1:1:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):64:64 -> f
-    2:2:void <init>(int):41:41 -> f
-    2:2:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):64 -> f
-    1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59:60 -> g
-    3:3:void <init>(int):41:41 -> g
-    3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):60 -> g
+    1:1:int getAsCfAccessFlags():72 -> C
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> D
+    1:1:int getAsDexAccessFlags():77 -> D
+    1:1:boolean isEnum():102:102 -> E
+    1:1:boolean isTransient():94:94 -> F
+    1:1:boolean isVolatile():86:86 -> G
+    1:6:java.util.List getNames():21:26 -> c
+    1:6:java.util.List getPredicates():31:36 -> e
+    1:1:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):67:67 -> f
+    2:2:void <init>(int):40:40 -> f
+    2:2:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):67 -> f
+    1:1:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):63:63 -> g
+    2:2:void <init>(int):40:40 -> g
+    2:2:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):63 -> g
+    1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):58:59 -> h
+    3:3:void <init>(int):40:40 -> h
+    3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59 -> h
 com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.graph.m0:
 com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.graph.n0:
 com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.graph.o0:
@@ -18950,197 +18878,149 @@
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:4:void <init>():13:16 -> <init>
-    1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):20:20 -> a
-    1:1:com.android.tools.r8.graph.FieldAccessInfo get(com.android.tools.r8.graph.DexField):13 -> a
-    2:3:void extend(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):24:25 -> a
-    4:5:void forEach(java.util.function.Consumer):31:32 -> a
-    6:6:boolean lambda$removeIf$0(java.util.function.BiPredicate,java.util.Map$Entry):36:36 -> a
-    7:7:void removeIf(java.util.function.BiPredicate):36:36 -> a
-    8:9:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):41:42 -> a
-    10:11:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):44:45 -> a
-    12:12:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):44:44 -> a
-    13:13:boolean verifyMappingIsOneToOne():52:52 -> a
-    1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):20:20 -> b
+    1:1:void flattenAccessContexts():20:20 -> a
+    2:2:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):25:25 -> a
+    2:2:com.android.tools.r8.graph.FieldAccessInfo get(com.android.tools.r8.graph.DexField):13 -> a
+    3:4:void extend(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):29:30 -> a
+    5:6:void forEach(java.util.function.Consumer):36:37 -> a
+    7:7:boolean lambda$removeIf$0(java.util.function.BiPredicate,java.util.Map$Entry):42:42 -> a
+    8:8:void removeIf(java.util.function.BiPredicate):42:42 -> a
+    9:10:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):47:48 -> a
+    11:13:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):50:50 -> a
+    1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):25:25 -> b
+    2:2:boolean verifyMappingIsOneToOne():58:58 -> b
 com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.graph.p0:
-    java.util.Map readsWithContexts -> b
-    java.util.Map writesWithContexts -> c
-    com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> d
+    java.util.Map readsWithContexts -> c
+    java.util.Map writesWithContexts -> d
+    com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> e
+    boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexField field -> a
-    1:3:void <clinit>():20:22 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexField):35:36 -> <init>
-    1:4:void forEachIndirectAccess(java.util.function.Consumer):64:67 -> a
-    5:5:boolean lambda$forEachIndirectAccess$0(java.util.Set,com.android.tools.r8.graph.DexField):66:66 -> a
-    6:6:void forEachAccessInMap(java.util.Map,java.util.function.Predicate,java.util.function.Consumer):76:76 -> a
-    7:8:void lambda$forEachAccessInMap$2(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexField,java.util.Set):78:79 -> a
-    9:14:void forEachIndirectAccessWithContexts(java.util.function.BiConsumer):88:93 -> a
-    15:15:void extendAccessesWithContexts(java.util.Map,java.util.function.Predicate,java.util.Map):101:101 -> a
-    16:19:void lambda$extendAccessesWithContexts$6(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.DexField,java.util.Set):103:106 -> a
-    20:20:java.util.Set lambda$extendAccessesWithContexts$5(com.android.tools.r8.graph.DexField):105:105 -> a
-    21:24:boolean isWrittenInMethodSatisfying(java.util.function.Predicate):154:157 -> a
-    25:27:boolean isWrittenOutside(com.android.tools.r8.graph.DexEncodedMethod):171:173 -> a
-    28:33:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):184:189 -> a
-    34:34:void clearWrites():206:206 -> a
-    35:50:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):210:225 -> a
-    51:53:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):215:217 -> a
-    54:57:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):216:219 -> a
-    1:1:com.android.tools.r8.graph.DexField getField():46:46 -> b
-    2:2:boolean lambda$forEachIndirectAccess$1(java.util.Set,com.android.tools.r8.graph.DexField):68:68 -> b
-    3:3:boolean lambda$forEachIndirectAccessWithContexts$3(com.android.tools.r8.graph.DexField):90:90 -> b
-    4:10:void forEachReadContext(java.util.function.Consumer):116:122 -> b
-    11:16:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):193:198 -> b
-    17:19:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):227:229 -> b
-    20:23:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):228:231 -> b
-    1:4:com.android.tools.r8.graph.DexEncodedMethod getUniqueReadContext():51:54 -> c
-    5:5:boolean lambda$forEachIndirectAccessWithContexts$4(com.android.tools.r8.graph.DexField):92:92 -> c
-    1:1:boolean isRead():132:132 -> d
-    2:2:java.util.Set lambda$recordRead$7(com.android.tools.r8.graph.DexField):188:188 -> d
-    1:1:boolean isWritten():146:146 -> e
-    2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):197:197 -> e
-    1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):229:229 -> f
-    1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):217:217 -> g
+    boolean hasReflectiveAccess -> b
+    1:3:void <clinit>():21:23 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexField):39:40 -> <init>
+    1:13:void flattenAccessContexts(java.util.Map):50:62 -> a
+    14:15:void lambda$flattenAccessContexts$1(java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):54:55 -> a
+    16:19:void forEachIndirectAccess(java.util.function.Consumer):104:107 -> a
+    20:20:boolean lambda$forEachIndirectAccess$2(java.util.Set,com.android.tools.r8.graph.DexField):106:106 -> a
+    21:21:void forEachAccessInMap(java.util.Map,java.util.function.Predicate,java.util.function.Consumer):116:116 -> a
+    22:23:void lambda$forEachAccessInMap$4(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexField,java.util.Set):118:119 -> a
+    24:29:void forEachIndirectAccessWithContexts(java.util.function.BiConsumer):128:133 -> a
+    30:30:void extendAccessesWithContexts(java.util.Map,java.util.function.Predicate,java.util.Map):141:141 -> a
+    31:34:void lambda$extendAccessesWithContexts$8(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.DexField,java.util.Set):143:146 -> a
+    35:35:java.util.Set lambda$extendAccessesWithContexts$7(com.android.tools.r8.graph.DexField):145:145 -> a
+    36:41:void forEachAccessContext(java.util.Map,java.util.function.Consumer):167:172 -> a
+    42:45:boolean isWrittenInMethodSatisfying(java.util.function.Predicate):213:216 -> a
+    46:48:boolean isWrittenOutside(com.android.tools.r8.graph.DexEncodedMethod):230:232 -> a
+    49:54:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):243:248 -> a
+    55:55:void clearWrites():265:265 -> a
+    56:57:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):269:270 -> a
+    58:58:void setHasReflectiveAccess():185:185 -> a
+    58:58:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):271 -> a
+    59:73:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):273:287 -> a
+    74:76:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):277:279 -> a
+    77:80:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):278:281 -> a
+    1:2:void flattenAccessContexts():44:45 -> b
+    3:3:java.util.Set lambda$flattenAccessContexts$0(com.android.tools.r8.graph.DexField):51:51 -> b
+    4:4:boolean lambda$forEachIndirectAccess$3(java.util.Set,com.android.tools.r8.graph.DexField):108:108 -> b
+    5:5:void forEachReadContext(java.util.function.Consumer):154:154 -> b
+    6:11:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):252:257 -> b
+    12:14:void lambda$rewrittenWithLens$14(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):289:291 -> b
+    15:18:void lambda$rewrittenWithLens$14(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):290:293 -> b
+    1:1:com.android.tools.r8.graph.DexField getField():73:73 -> c
+    2:2:boolean lambda$forEachIndirectAccessWithContexts$5(com.android.tools.r8.graph.DexField):130:130 -> c
+    3:3:void forEachWriteContext(java.util.function.Consumer):159:159 -> c
+    1:5:int getNumberOfWriteContexts():78:82 -> d
+    6:6:boolean lambda$forEachIndirectAccessWithContexts$6(com.android.tools.r8.graph.DexField):132:132 -> d
+    1:4:com.android.tools.r8.graph.DexEncodedMethod getUniqueReadContext():91:94 -> e
+    5:5:java.util.Set lambda$recordRead$9(com.android.tools.r8.graph.DexField):247:247 -> e
+    1:1:boolean hasReflectiveAccess():181:181 -> f
+    2:2:java.util.Set lambda$recordWrite$10(com.android.tools.r8.graph.DexField):256:256 -> f
+    1:1:boolean isRead():191:191 -> g
+    2:2:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):279:279 -> g
+    1:1:boolean isWritten():205:205 -> h
+    2:2:java.util.Set lambda$rewrittenWithLens$13(com.android.tools.r8.graph.DexField):291:291 -> h
+    1:1:void setHasReflectiveAccess():185:185 -> i
 com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.graph.q0:
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:1:void <init>():50:50 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense getIdentityLense():501:501 -> a
-    2:6:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteReferenceKeys(java.util.Map,java.util.function.Function):678:682 -> a
-    1:6:boolean assertDefinitionsNotModified(java.lang.Iterable):509:514 -> assertDefinitionsNotModified
-    1:11:boolean assertReferencesNotModified(java.lang.Iterable):520:530 -> assertReferencesNotModified
-    1:1:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):497:497 -> isContextFreeForMethod
-    1:1:boolean isIdentityLense():505:505 -> isIdentityLense
-    1:2:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):444:445 -> lookupMethod
-    1:6:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):455:460 -> lookupMethodInAllContexts
-    1:7:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):474:480 -> lookupReference
-    1:14:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):423:436 -> mapDexEncodedMethod
-    1:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsConservatively(java.util.Set):634:652 -> rewriteMethodsConservatively
-    1:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsWithRenamedSignature(java.util.Set):625:630 -> rewriteMethodsWithRenamedSignature
-    1:14:java.util.SortedSet rewriteMutableMethodsConservatively(java.util.Set):656:669 -> rewriteMutableMethodsConservatively
-    1:11:java.util.Set rewriteMutableReferencesConservatively(java.util.Set):571:581 -> rewriteMutableReferencesConservatively
-    1:3:java.util.Set rewriteMutableTypesConservatively(java.util.Set):617:619 -> rewriteMutableTypesConservatively
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList rewriteReferencesConservatively(java.util.List):537:550 -> rewriteReferencesConservatively
-    15:28:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteReferencesConservatively(java.util.Set):554:567 -> rewriteReferencesConservatively
-    29:42:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap rewriteReferencesConservatively(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):589:602 -> rewriteReferencesConservatively
-    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypesConservatively(java.util.Set):609:613 -> rewriteTypesConservatively
-    1:29:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):699:727 -> verifyMappingToOriginalProgram
-    30:50:boolean verifyIsBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexApplication,java.util.Set,com.android.tools.r8.graph.DexItemFactory):746:766 -> verifyMappingToOriginalProgram
-    30:50:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):728 -> verifyMappingToOriginalProgram
-    51:55:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):727:731 -> verifyMappingToOriginalProgram
-com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.graph.q0$a:
-com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.graph.q0$b:
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:1:void <init>():42:42 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense getIdentityLense():229:229 -> a
+    2:6:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteReferenceKeys(java.util.Map,java.util.function.Function):406:410 -> a
+    1:6:boolean assertDefinitionsNotModified(java.lang.Iterable):237:242 -> assertDefinitionsNotModified
+    1:11:boolean assertReferencesNotModified(java.lang.Iterable):248:258 -> assertReferencesNotModified
+    1:1:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):225:225 -> isContextFreeForMethod
+    1:1:boolean isIdentityLense():233:233 -> isIdentityLense
+    1:2:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):172:173 -> lookupMethod
+    1:6:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):183:188 -> lookupMethodInAllContexts
+    1:7:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):202:208 -> lookupReference
+    1:14:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):151:164 -> mapDexEncodedMethod
+    1:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsConservatively(java.util.Set):362:380 -> rewriteMethodsConservatively
+    1:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsWithRenamedSignature(java.util.Set):353:358 -> rewriteMethodsWithRenamedSignature
+    1:14:java.util.SortedSet rewriteMutableMethodsConservatively(java.util.Set):384:397 -> rewriteMutableMethodsConservatively
+    1:11:java.util.Set rewriteMutableReferencesConservatively(java.util.Set):299:309 -> rewriteMutableReferencesConservatively
+    1:3:java.util.Set rewriteMutableTypesConservatively(java.util.Set):345:347 -> rewriteMutableTypesConservatively
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList rewriteReferencesConservatively(java.util.List):265:278 -> rewriteReferencesConservatively
+    15:28:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteReferencesConservatively(java.util.Set):282:295 -> rewriteReferencesConservatively
+    29:42:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap rewriteReferencesConservatively(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):317:330 -> rewriteReferencesConservatively
+    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypesConservatively(java.util.Set):337:341 -> rewriteTypesConservatively
+    1:29:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):427:455 -> verifyMappingToOriginalProgram
+    30:50:boolean verifyIsBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexApplication,java.util.Set,com.android.tools.r8.graph.DexItemFactory):474:494 -> verifyMappingToOriginalProgram
+    30:50:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):456 -> verifyMappingToOriginalProgram
+    51:55:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):455:459 -> verifyMappingToOriginalProgram
+com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.graph.q0$a:
     java.util.Map typeMap -> a
     java.util.Map methodMap -> b
     java.util.Map fieldMap -> c
     com.android.tools.r8.com.google.common.collect.BiMap originalFieldSignatures -> d
     com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> e
-    1:8:void <init>():342:349 -> <init>
-    1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):362:362 -> a
-    2:2:void map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):369:369 -> a
-    3:6:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):393:396 -> a
-    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.q0$c:
+    1:8:void <init>():70:77 -> <init>
+    1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):90:90 -> a
+    2:2:void map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):97:97 -> a
+    3:6:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):121:124 -> a
+    1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):90:90 -> b
+    1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):104 -> b
+    2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):105:105 -> b
+com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.graph.q0$b:
     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.q0$d:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):54:56 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():60:60 -> a
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():64:64 -> b
+com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.graph.q0$c:
     com.android.tools.r8.graph.GraphLense$IdentityGraphLense INSTANCE -> a
-    1:1:void <clinit>():774:774 -> <clinit>
-    1:1:void <init>():776:776 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense getInstance():779:779 -> b
-    1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$100():772 -> b
-    1:1:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):814:814 -> lookupMethod
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):819:819 -> lookupPrototypeChanges
-com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.graph.q0$e:
-    1:1:void <clinit>():843:843 -> <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):871:871 -> <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):849:873 -> <init>
-    27:35:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):872:880 -> <init>
-    1:4:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):891:894 -> getOriginalFieldSignature
-    1:4:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):900:903 -> getOriginalMethodSignature
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):885:885 -> getOriginalType
-    1:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):908:910 -> getRenamedFieldSignature
-    1:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):916:918 -> getRenamedMethodSignature
-    1:1:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):1037:1037 -> isContextFreeForMethod
-    1:1:boolean isContextFreeForMethods():1032:1032 -> isContextFreeForMethods
-    1:2:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1026:1027 -> lookupField
-    1:1:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):969:969 -> lookupGetFieldForMethod
-    1:12:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):948:959 -> lookupMethod
-    1:3:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):1017:1019 -> lookupMethodInAllContexts
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):964:964 -> lookupPrototypeChanges
-    1:1:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):974:974 -> lookupPutFieldForMethod
-    1:19:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):924:942 -> lookupType
-    1:12:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):997:1008 -> mapVirtualInterfaceInvocationTypes
+    1:1:void <clinit>():502:502 -> <clinit>
+    1:1:void <init>():504:504 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense getInstance():507:507 -> b
+    1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$000():500 -> b
+    1:1:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):542:542 -> lookupMethod
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):547:547 -> lookupPrototypeChanges
+com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.graph.q0$d:
+    1:1:void <clinit>():571:571 -> <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):599:599 -> <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):577:601 -> <init>
+    27:35:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):600:608 -> <init>
+    1:4:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):619:622 -> getOriginalFieldSignature
+    1:4:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):628:631 -> getOriginalMethodSignature
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):613:613 -> getOriginalType
+    1:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):636:638 -> getRenamedFieldSignature
+    1:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):644:646 -> getRenamedMethodSignature
+    1:1:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):765:765 -> isContextFreeForMethod
+    1:1:boolean isContextFreeForMethods():760:760 -> isContextFreeForMethods
+    1:2:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):754:755 -> lookupField
+    1:1:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):697:697 -> lookupGetFieldForMethod
+    1:12:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):676:687 -> lookupMethod
+    1:3:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):745:747 -> lookupMethodInAllContexts
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):692:692 -> lookupPrototypeChanges
+    1:1:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):702:702 -> lookupPutFieldForMethod
+    1:19:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):652:670 -> lookupType
+    1:12:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):725:736 -> mapVirtualInterfaceInvocationTypes
     13:13:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> mapVirtualInterfaceInvocationTypes
-    13:13:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1008 -> mapVirtualInterfaceInvocationTypes
-    14:16:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1008:1010 -> mapVirtualInterfaceInvocationTypes
+    13:13:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):736 -> mapVirtualInterfaceInvocationTypes
+    14:16:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):736:738 -> mapVirtualInterfaceInvocationTypes
     17:17:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> mapVirtualInterfaceInvocationTypes
-    17:17:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1010 -> 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):1010:1010 -> mapVirtualInterfaceInvocationTypes
-    1:17:java.lang.String toString():1042:1058 -> toString
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> com.android.tools.r8.graph.q0$f:
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none -> d
-    boolean hasBeenChangedToReturnVoid -> a
-    boolean extraNullParameter -> b
-    com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo removedArgumentsInfo -> c
-    1:161:void <clinit>():76:236 -> <clinit>
-    162:162:void <init>():243:243 -> <clinit>
-    162:162:void <clinit>():236 -> <clinit>
-    163:163:void <clinit>():236:236 -> <clinit>
-    1:5:void <init>(boolean,boolean,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):249:253 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo():275:275 -> a
-    2:4:com.android.tools.r8.ir.code.ConstInstruction getConstantReturn(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position):288:290 -> a
-    5:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withRemovedArguments(com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):328:329 -> a
-    1:1:boolean hasBeenChangedToReturnVoid():271:271 -> b
-    1:1:boolean hasExtraNullParameter():267:267 -> c
-    1:1:boolean isEmpty():261:261 -> d
-    2:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo():275:275 -> d
-    2:2:boolean isEmpty():263 -> d
-    3:3:boolean isEmpty():263:263 -> d
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none():257:257 -> e
-    1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withConstantReturn():322:323 -> f
-    1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withExtraNullParameter():333:334 -> g
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.q0$f$a:
-    com.android.tools.r8.graph.DexType type -> c
-    boolean isAlwaysNull -> b
-    int argumentIndex -> a
-    1:1:void <init>(int,boolean,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense$1):78:78 -> <init>
-    2:5:void <init>(int,boolean,com.android.tools.r8.graph.DexType):112:115 -> <init>
-    1:1:int getArgumentIndex():123:123 -> a
-    2:3:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo withArgumentIndex(int):139:140 -> a
-    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.r0:
-    com.android.tools.r8.graph.DexType type -> c
-    boolean isAlwaysNull -> b
-    boolean $assertionsDisabled -> d
-    int argumentIndex -> a
-    1:1:void <clinit>():80:80 -> <clinit>
-    1:5:void <init>():80:84 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setArgumentIndex(int):87:87 -> a
-    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.q0$f$b:
-    java.util.List removedArguments -> a
-    com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty -> b
-    boolean $assertionsDisabled -> c
-    1:3:void <clinit>():145:147 -> <clinit>
-    1:3:void <init>(java.util.List):151:153 -> <init>
-    1:6:boolean verifyRemovedArguments(java.util.List):157:162 -> a
-    7:7:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty():170:170 -> a
-    8:10:boolean isArgumentRemoved(int):184:186 -> a
-    11:32:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo combine(com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):199:220 -> a
-    33:34:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):225:226 -> a
-    35:36:void lambda$createParameterAnnotationsRemover$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):227:228 -> a
-    37:37:boolean lambda$createParameterAnnotationsRemover$0(int,int):229:229 -> a
-    1:1:boolean hasRemovedArguments():180:180 -> b
-    1:3:java.util.ListIterator iterator():174:176 -> c
-    1:1:int numberOfRemovedArguments():195:195 -> d
-com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.s0:
+    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):738 -> 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):738:738 -> mapVirtualInterfaceInvocationTypes
+    1:17:java.lang.String toString():770:786 -> toString
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.r0:
     boolean $assertionsDisabled -> b
     int sortedIndex -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -19154,7 +19034,7 @@
     1:1:void flushCachedValues():53:53 -> flushCachedValues
     2:2:void resetSortedIndex():58:58 -> flushCachedValues
     2:2:void flushCachedValues():54 -> flushCachedValues
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.t0:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.s0:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
@@ -19178,7 +19058,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.u0:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.t0:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -19212,7 +19092,7 @@
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:53 -> g
     5:5:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.org.objectweb.asm.Type):48:48 -> g
     5:5:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):53 -> g
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.v0:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.u0:
     java.util.function.Consumer classConsumer -> b
     com.android.tools.r8.graph.JarApplicationReader application -> a
     byte[] CLASSFILE_HEADER -> c
@@ -19238,8 +19118,7 @@
     54:54:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):100 -> a
     55:55:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):100:100 -> a
     56:58:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):149:151 -> a
-    59:61:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):163:165 -> a
-    62:62:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):163:163 -> a
+    59:62:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):163:163 -> a
     63:70:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):545:552 -> a
     63:70:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):69 -> a
     71:71:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -19256,10 +19135,10 @@
     5:5:boolean retainCompileTimeAnnotation(java.lang.String,com.android.tools.r8.graph.JarApplicationReader):173:173 -> b
     5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):158 -> b
     6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):160:160 -> b
-    7:8:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):179:180 -> 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):179:185 -> b
+    7:9:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):179:179 -> b
+    11:15:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):181:185 -> b
     1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):144:144 -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.v0$a:
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.u0$a:
     java.util.List values -> d
     java.util.List names -> c
     boolean $assertionsDisabled -> e
@@ -19270,8 +19149,7 @@
     2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):877:884 -> <init>
     1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):894:895 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):900:900 -> a
-    4:5:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):901:902 -> a
-    6:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):901:901 -> a
+    4:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):901:901 -> a
     7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):907:907 -> a
     8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):908:909 -> a
     10:10:void visitEnd():915:915 -> a
@@ -19285,7 +19163,7 @@
     96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):986:986 -> a
     96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1014 -> a
     96:96:void visit(java.lang.String,java.lang.Object):889 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.v0$b:
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.u0$b:
     com.android.tools.r8.graph.ClassKind classKind -> d
     java.util.List annotations -> r
     java.util.Set methodSignatures -> y
@@ -19437,7 +19315,7 @@
     1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> j
     1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> k
     1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.v0$c:
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.u0$c:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> h
@@ -19466,7 +19344,7 @@
     56:59:java.util.List getAnnotations():657:660 -> a
     56:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):583 -> a
     60:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):583:583 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.v0$d:
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.u0$d:
     java.util.List parameterFlags -> r
     int annotableParameterCount -> o
     java.util.List parameterNames -> q
@@ -19504,8 +19382,8 @@
     1:2:void visitEnd():796:797 -> c
     3:5:boolean classRequiresCode():787:789 -> c
     3:5:void visitEnd():797 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1116 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1122 -> c
     6:6:boolean classRequiresCode():789 -> c
     6:6:void visitEnd():797 -> c
     7:9:boolean classRequiresCode():789:791 -> c
@@ -19538,17 +19416,17 @@
     84:84:void visitEnd():840:840 -> c
     85:93:void visitEnd():838:846 -> c
     1:4:java.util.List getAnnotations():862:865 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.v0$e:
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.u0$e:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
     1:8:void <init>():1018:1025 -> <init>
-com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.graph.w0:
+com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.graph.v0:
     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() -> i
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.C0:
+    com.android.tools.r8.graph.PresortedComparable getKey() -> k
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.B0:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> c
     com.android.tools.r8.graph.CfCode code -> b
     boolean $assertionsDisabled -> e
@@ -19586,15 +19464,15 @@
     1:1:java.lang.String toString():219:219 -> toString
     2:2:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):224:224 -> toString
     1:1:boolean verifyNoInputReaders():946:946 -> verifyNoInputReaders
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.x0:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.y0:
+com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.w0:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.x0:
     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):259:263 -> <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[]):269:278 -> a
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.z0:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.y0:
     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):231:231 -> <init>
@@ -19603,9 +19481,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):231:231 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):243:243 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):231 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.A0:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.z0:
     1:1:void <init>(java.lang.String):88:88 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.B0:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.A0:
     java.util.Map canonicalDebugLocalInfo -> q
     java.util.Map labelMap -> r
     int maxStack -> l
@@ -19655,10 +19533,8 @@
     33:33:void visitInsn(int):459:459 -> a
     34:34:void visitInsn(int):448:448 -> a
     35:35:void visitInsn(int):438:438 -> a
-    36:38:void visitInsn(int):426:428 -> a
-    39:39:void visitInsn(int):426:426 -> a
-    40:42:void visitInsn(int):420:422 -> a
-    43:43:void visitInsn(int):420:420 -> a
+    36:39:void visitInsn(int):426:426 -> a
+    40:43:void visitInsn(int):420:420 -> a
     44:44:void visitInsn(int):415:415 -> a
     45:45:void visitInsn(int):411:411 -> a
     46:46:void visitInsn(int):402:402 -> a
@@ -19756,7 +19632,7 @@
     4:8:void visitVarInsn(int,int):642:646 -> d
     9:35:void visitVarInsn(int,int):638:664 -> d
     36:36:void visitVarInsn(int,int):657:657 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.D0:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.C0:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> j
@@ -19778,8 +19654,8 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():248:248 -> g
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():188:188 -> h
     1:1:java.lang.String toString():253:253 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.D0$a:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.D0$b:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.C0$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.C0$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
@@ -19793,7 +19669,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():163:163 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():155:155 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.D0$c:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.C0$c:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> l
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> m
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> k
@@ -19805,73 +19681,73 @@
     3:3:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):222:222 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
     1:7:com.android.tools.r8.graph.LazyLoadedDexApplication build():228:234 -> f
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.E0:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.D0:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(int,int):65:65 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags copy():70:70 -> B
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> C
-    1:1:int getAsCfAccessFlags():100 -> C
-    1:1:int getAsDexAccessFlags():105:105 -> D
-    2:2:boolean isSynchronized():124:124 -> D
-    2:2:int getAsDexAccessFlags():106 -> D
-    3:3:int getAsDexAccessFlags():106:106 -> D
-    4:4:void unsetSynchronized():132:132 -> D
-    4:4:int getAsDexAccessFlags():107 -> D
-    5:5:void setDeclaredSynchronized():202:202 -> D
-    5:5:int getAsDexAccessFlags():108 -> D
-    6:6:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> D
-    6:6:int getAsDexAccessFlags():110 -> D
-    1:12:int com.android.tools.r8.graph.AccessFlags.getAsKotlinFlags():75:86 -> E
-    1:12:int getAsKotlinFlags():115 -> E
-    13:13:boolean com.android.tools.r8.graph.AccessFlags.isOpen():201:201 -> E
-    13:13:int com.android.tools.r8.graph.AccessFlags.getAsKotlinFlags():88 -> E
-    13:13:int getAsKotlinFlags():115 -> E
-    14:16:int com.android.tools.r8.graph.AccessFlags.getAsKotlinFlags():89:91 -> E
-    14:16:int getAsKotlinFlags():115 -> E
-    17:21:int getAsKotlinFlags():116:120 -> E
-    1:1:boolean isAbstract():164:164 -> F
-    1:1:boolean isBridge():136:136 -> G
-    1:1:boolean isConstructor():184:184 -> H
-    1:1:boolean isNative():156:156 -> I
-    1:1:boolean isStrict():176:176 -> J
-    1:1:boolean isSynchronized():124:124 -> K
-    1:1:boolean isVarargs():148:148 -> L
-    1:1:void setBridge():140:140 -> M
-    1:1:void setNative():160:160 -> N
-    1:1:void unsetAbstract():172:172 -> O
-    1:1:void unsetBridge():144:144 -> P
-    1:1:void unsetConstructor():192:192 -> Q
+    1:1:com.android.tools.r8.graph.MethodAccessFlags copy():70:70 -> C
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> D
+    1:1:int getAsCfAccessFlags():100 -> D
+    1:1:int getAsDexAccessFlags():105:105 -> E
+    2:2:boolean isSynchronized():124:124 -> E
+    2:2:int getAsDexAccessFlags():106 -> E
+    3:3:int getAsDexAccessFlags():106:106 -> E
+    4:4:void unsetSynchronized():132:132 -> E
+    4:4:int getAsDexAccessFlags():107 -> E
+    5:5:void setDeclaredSynchronized():202:202 -> E
+    5:5:int getAsDexAccessFlags():108 -> E
+    6:6:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> E
+    6:6:int getAsDexAccessFlags():110 -> E
+    1:12:int com.android.tools.r8.graph.AccessFlags.getAsKotlinFlags():75:86 -> F
+    1:12:int getAsKotlinFlags():115 -> F
+    13:13:boolean com.android.tools.r8.graph.AccessFlags.isOpen():201:201 -> F
+    13:13:int com.android.tools.r8.graph.AccessFlags.getAsKotlinFlags():88 -> F
+    13:13:int getAsKotlinFlags():115 -> F
+    14:16:int com.android.tools.r8.graph.AccessFlags.getAsKotlinFlags():89:91 -> F
+    14:16:int getAsKotlinFlags():115 -> F
+    17:21:int getAsKotlinFlags():116:120 -> F
+    1:1:boolean isAbstract():164:164 -> G
+    1:1:boolean isBridge():136:136 -> H
+    1:1:boolean isConstructor():184:184 -> I
+    1:1:boolean isNative():156:156 -> J
+    1:1:boolean isStrict():176:176 -> K
+    1:1:boolean isSynchronized():124:124 -> L
+    1:1:boolean isVarargs():148:148 -> M
+    1:1:void setBridge():140:140 -> N
+    1:1:void setNative():160:160 -> O
+    1:1:void unsetAbstract():172:172 -> P
+    1:1:void unsetBridge():144:144 -> Q
+    1:1:void unsetConstructor():192:192 -> R
     1:1:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):85:85 -> a
     2:2:void <init>(int):61:61 -> a
     2:2:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):86 -> a
-    1:9:java.util.List getNames():36:44 -> b
-    10:12:com.android.tools.r8.graph.MethodAccessFlags fromSharedAccessFlags(int,boolean):79:81 -> b
-    1:9:java.util.List getPredicates():49:57 -> d
-    1:1:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):90:90 -> e
-    2:2:void <init>(int):61:61 -> e
-    2:2:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):90 -> e
-    3:3:boolean isDeclaredSynchronized():198:198 -> e
-    3:3:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):91 -> e
-    4:4:void setSynchronized():128:128 -> e
-    4:4:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):92 -> e
-    5:5:void unsetDeclaredSynchronized():206:206 -> e
-    5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):93 -> e
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.graph.F0:
+    1:3:com.android.tools.r8.graph.MethodAccessFlags fromSharedAccessFlags(int,boolean):79:81 -> b
+    1:9:java.util.List getNames():36:44 -> c
+    1:9:java.util.List getPredicates():49:57 -> e
+    1:1:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):90:90 -> f
+    2:2:void <init>(int):61:61 -> f
+    2:2:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):90 -> f
+    3:3:boolean isDeclaredSynchronized():198:198 -> f
+    3:3:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):91 -> f
+    4:4:void setSynchronized():128:128 -> f
+    4:4:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):92 -> f
+    5:5:void unsetDeclaredSynchronized():206:206 -> f
+    5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):93 -> f
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.graph.E0:
     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.G0:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.graph.F0:
     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.H0:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.graph.G0:
     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
@@ -19917,13 +19793,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.H0$a:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.graph.G0$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.I0:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.graph.H0:
     com.android.tools.r8.graph.DexProto[] protos -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
@@ -19963,7 +19839,7 @@
     1:2:void initializeProtos(int):28:29 -> l
     1:2:void initializeStrings(int):43:44 -> m
     1:2:void initializeTypes(int):38:39 -> n
-com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.J0:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.I0:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
     int missingParameterAnnotations -> b
@@ -19985,13 +19861,13 @@
     2:14:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):156:168 -> d
     1:2:boolean equals(java.lang.Object):79:80 -> equals
     1:1:int hashCode():71:71 -> hashCode
-com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.graph.K0:
+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.L0:
+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>
@@ -20004,7 +19880,7 @@
     20:21:void run(com.android.tools.r8.graph.DexProgramClass[]):66:67 -> a
     void visit(com.android.tools.r8.graph.DexClass) -> b
     void visit(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.M0:
+com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.L0:
     com.android.tools.r8.graph.DexProgramClass holder -> a
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     boolean $assertionsDisabled -> c
@@ -20012,7 +19888,7 @@
     1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):13:16 -> <init>
     1:1:boolean equals(java.lang.Object):21:21 -> equals
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.N0:
+com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.M0:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> a
     boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
@@ -20028,28 +19904,28 @@
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> e
     boolean isVirtualTarget() -> f
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> f
-com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.N0$a:
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.N0$b:
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.M0$a:
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.M0$b:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
-    1:1:void <clinit>():478:478 -> <clinit>
-    1:1:void <init>():480:480 -> <init>
+    1:1:void <clinit>():488:488 -> <clinit>
+    1:1:void <init>():490:490 -> <init>
     boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> c
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> e
     boolean isVirtualTarget() -> f
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> f
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.N0$c:
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.M0$c:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
-    1:1:void <clinit>():536:536 -> <clinit>
-    1:1:void <init>():538:538 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.N0$d:
-    1:1:void <init>():438:438 -> <init>
+    1:1:void <clinit>():546:546 -> <clinit>
+    1:1:void <init>():548:548 -> <init>
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.M0$d:
+    1:1:void <init>():448:448 -> <init>
     java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
     java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> d
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.N0$e:
-    1:1:void <init>():502:502 -> <init>
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.M0$e:
+    1:1:void <init>():512:512 -> <init>
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> a
     void forEachFailureDependency(java.util.function.Consumer) -> a
     boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
@@ -20059,27 +19935,27 @@
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> e
     boolean isVirtualTarget() -> f
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> f
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.N0$f:
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.M0$f:
     java.util.Collection methodsCausingError -> a
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):543:543 -> <init>
-    2:3:void <init>(java.util.Collection):547:548 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):553:553 -> a
-com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.N0$g:
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):553:553 -> <init>
+    2:3:void <init>(java.util.Collection):557:558 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):563:563 -> a
+com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.M0$g:
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():577:577 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):580:581 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):577:577 -> a
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.N0$h:
+    1:1:void <clinit>():587:587 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):590:591 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):587:587 -> a
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.M0$h:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> b
-    1:2:void <clinit>():558:559 -> <clinit>
-    1:1:void <init>(java.util.Collection):562:562 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):557:557 -> a
-    2:4:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):566:568 -> a
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.N0$i:
+    1:2:void <clinit>():568:569 -> <clinit>
+    1:1:void <init>(java.util.Collection):572:572 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):567:567 -> a
+    2:4:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):576:578 -> a
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.M0$i:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
-    1:1:void <clinit>():574:574 -> <clinit>
-    1:1:void <init>():572:572 -> <init>
-com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.N0$j:
+    1:1:void <clinit>():584:584 -> <clinit>
+    1:1:void <init>():582:582 -> <init>
+com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.M0$j:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
     com.android.tools.r8.graph.DexClass resolvedHolder -> b
     com.android.tools.r8.graph.DexEncodedMethod resolvedMethod -> c
@@ -20098,15 +19974,16 @@
     51:51:boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):133:133 -> a
     52:52:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):328:328 -> a
     52:52:boolean lambda$lookupInvokeSpecialTarget$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):156 -> a
-    53:121:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):362:430 -> a
-    122:123:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):402:403 -> a
+    53:118:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):362:427 -> a
+    119:120:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):397:398 -> a
+    121:124:void addIfDefaultMethodWithLambdaInstantiations(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):439:442 -> a
     com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult asSingleResolution() -> b
     1:1:boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):126:126 -> b
     2:9:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):334:341 -> b
     10:11:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
     10:11:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):341 -> b
     12:21:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):343:352 -> b
-    22:23:void lambda$lookupInterfaceTargets$3(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):413:414 -> b
+    22:23:void lambda$lookupInterfaceTargets$3(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):406:407 -> b
     1:5:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):244:248 -> c
     1:12:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):151:162 -> d
     boolean isSingleResolution() -> e
@@ -20117,7 +19994,7 @@
     6:6:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):191 -> f
     7:16:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):195:204 -> f
     17:18:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):192:193 -> f
-    19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> f
+    19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> f
     19:19:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):193 -> f
     20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> f
     20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> f
@@ -20125,16 +20002,81 @@
     21:21:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):193:193 -> f
     1:1:com.android.tools.r8.graph.DexClass getResolvedHolder():107:107 -> g
     1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():111:111 -> h
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.O0:
+com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.P0:
+    com.android.tools.r8.graph.RewrittenPrototypeDescription none -> d
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo removedArgumentsInfo -> c
+    boolean hasBeenChangedToReturnVoid -> a
+    boolean extraNullParameter -> b
+    1:180:void <clinit>():18:197 -> <clinit>
+    181:181:void <init>():204:204 -> <clinit>
+    181:181:void <clinit>():197 -> <clinit>
+    182:182:void <clinit>():197:197 -> <clinit>
+    1:5:void <init>(boolean,boolean,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):210:214 -> <init>
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(boolean,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):219:219 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo():242:242 -> a
+    3:5:com.android.tools.r8.ir.code.ConstInstruction getConstantReturn(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position):255:257 -> a
+    6:14:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):262:270 -> a
+    15:16:com.android.tools.r8.graph.RewrittenPrototypeDescription withRemovedArguments(com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):280:281 -> a
+    1:1:boolean hasBeenChangedToReturnVoid():238:238 -> b
+    1:1:boolean hasExtraNullParameter():234:234 -> c
+    1:1:boolean isEmpty():228:228 -> d
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo():242:242 -> d
+    2:2:boolean isEmpty():230 -> d
+    3:3:boolean isEmpty():230:230 -> d
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription none():224:224 -> e
+    1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription withConstantReturn():274:275 -> f
+    1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription withExtraNullParameter():285:286 -> g
+com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.N0:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.P0$a:
+    com.android.tools.r8.graph.DexType type -> c
+    boolean isAlwaysNull -> b
+    int argumentIndex -> a
+    1:1:void <init>(int,boolean,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.RewrittenPrototypeDescription$1):20:20 -> <init>
+    2:5:void <init>(int,boolean,com.android.tools.r8.graph.DexType):54:57 -> <init>
+    1:1:int getArgumentIndex():65:65 -> a
+    2:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo withArgumentIndex(int):81:82 -> a
+    1:1:com.android.tools.r8.graph.DexType getType():69:69 -> b
+    1:1:boolean isAlwaysNull():73:73 -> c
+    1:1:boolean isNeverUsed():77:77 -> d
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.O0:
+    com.android.tools.r8.graph.DexType type -> c
+    boolean isAlwaysNull -> b
+    boolean $assertionsDisabled -> d
+    int argumentIndex -> a
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:5:void <init>():22:26 -> <init>
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setArgumentIndex(int):29:29 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):39:39 -> a
+    3:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo build():44:46 -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():34:34 -> b
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo -> com.android.tools.r8.graph.P0$b:
+    java.util.List removedArguments -> a
+    com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo empty -> b
+    boolean $assertionsDisabled -> c
+    1:3:void <clinit>():87:89 -> <clinit>
+    1:3:void <init>(java.util.List):93:95 -> <init>
+    1:6:boolean verifyRemovedArguments(java.util.List):99:104 -> a
+    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo empty():112:112 -> a
+    8:10:boolean isArgumentRemoved(int):126:128 -> a
+    11:32:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):160:181 -> a
+    33:34:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):186:187 -> a
+    35:36:void lambda$createParameterAnnotationsRemover$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):188:189 -> a
+    37:37:boolean lambda$createParameterAnnotationsRemover$0(int,int):190:190 -> a
+    1:1:boolean hasRemovedArguments():122:122 -> b
+    2:12:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):139:149 -> b
+    1:3:java.util.ListIterator iterator():116:118 -> c
+    1:1:int numberOfRemovedArguments():156:156 -> d
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.Q0:
     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
-    1:11:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):27:37 -> a
-    12:19:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):28:35 -> a
-    20:22:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):73:75 -> a
-    1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):66:68 -> b
-    1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):47:59 -> c
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.P0:
+    1:10:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):27:36 -> a
+    11:17:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):28:34 -> a
+    18:20:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):72:74 -> a
+    1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):65:67 -> b
+    1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):46:58 -> c
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.R0:
     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
@@ -20166,10 +20108,10 @@
     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.Q0:
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.S0:
     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
+    1:27:void registerCallSite(com.android.tools.r8.graph.DexCallSite):99:125 -> registerCallSite
     1:1:boolean registerCheckCast(com.android.tools.r8.graph.DexType):55:55 -> registerCheckCast
     1:1:boolean registerConstClass(com.android.tools.r8.graph.DexType):51:51 -> registerConstClass
     1:35:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):60:94 -> registerMethodHandle
@@ -20183,13 +20125,13 @@
     45:45:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):68:68 -> registerMethodHandle
     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.Q0$a:
+    1:3:void registerProto(com.android.tools.r8.graph.DexProto):135:137 -> registerProto
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.S0$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.R0.a:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.graph.T0.a:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     java.util.List r8InstructionSequence -> d
     java.util.List javacInstructionSequence -> c
@@ -20208,46 +20150,46 @@
     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.R0.b:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.graph.T0.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.R0.d:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.graph.T0.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>
-    2:6:void <init>(com.android.tools.r8.graph.AppView):56:60 -> <init>
-    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.R0.c:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.R0.d$a:
+    1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView):57:61 -> <init>
+    1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):66:82 -> a
+    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):80:80 -> a
+    19:19:void done():88:88 -> a
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.graph.T0.c:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.T0.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>
-    2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):25:27 -> <init>
-    1:15:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):33:47 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):20:20 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):26:28 -> <init>
+    1:15:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):34:48 -> a
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    16:16:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):47 -> a
-    17:17:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):48:48 -> a
-com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.graph.S0.a:
+    16:16:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):48 -> a
+    17:17:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):49:49 -> a
+com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.graph.U0.a:
     java.util.Set sources -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:2:void <init>(java.util.Set):16:17 -> <init>
     1:4:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):22:25 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.graph.S0.b:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.graph.U0.b:
     boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.graph.S0.c:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.graph.U0.c:
     java.util.List collection -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:3:void <init>():12:14 -> <init>
     1:1:void add(com.android.tools.r8.graph.classmerging.MergedClasses):17:17 -> a
     2:3:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):22:23 -> a
-com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.graph.S0.d:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.graph.U0.d:
     java.util.Map mergedClasses -> a
     java.util.Map sources -> b
     boolean $assertionsDisabled -> c
@@ -20370,7 +20312,7 @@
     9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     9:9:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):80 -> a
     10:14:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):84:88 -> a
-    15:15:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):786:786 -> a
+    15:15:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):791:791 -> a
     15:15:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):88 -> a
     16:33:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):93:110 -> a
     34:39:java.lang.Void handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):116:121 -> a
@@ -20451,8 +20393,8 @@
     48:60:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):116:128 -> d
     61:70:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):119:128 -> d
     71:77:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):122:128 -> d
-    78:79:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):127:128 -> d
-    80:82:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):127:129 -> d
+    78:80:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):127:127 -> d
+    81:82:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):128:129 -> d
 com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.t.a.i.a:
     com.android.tools.r8.ir.analysis.constant.Bottom INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
@@ -20599,16 +20541,58 @@
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):55:63 -> b
     10:10:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):212:212 -> b
 com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.t.a.k.b:
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.t.a.l.a:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.t.a.l.a:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView):24:26 -> <init>
-    1:22:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):30:51 -> a
-    23:45:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):59:81 -> a
-    23:45:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
-    46:46:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52:52 -> a
-    47:63:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):91:107 -> a
+    com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
+    com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> c
+    1:7:void <init>(com.android.tools.r8.graph.AppView):24:30 -> <init>
+    8:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker,com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis):36:39 -> <init>
+    1:1:boolean enable(com.android.tools.r8.utils.InternalOptions):43:43 -> a
+    2:2:com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker():47:47 -> a
+    3:4:void acceptClassInitializerDefaultsResult(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):52:53 -> a
+    5:18:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):59:72 -> a
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.t.a.l.b:
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.Set nonZeroFields -> c
+    com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):41:41 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView):39:43 -> <init>
+    1:1:boolean isAlwaysZero(com.android.tools.r8.graph.DexEncodedField):47:47 -> a
+    1:1:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):76 -> a
+    1:1:void lambda$waveDone$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedField):84 -> a
+    2:4:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):77:77 -> a
+    2:4:void lambda$waveDone$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedField):84 -> a
+    5:5:void acceptClassInitializerDefaultsResult(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):52:52 -> a
+    6:7:void lambda$acceptClassInitializerDefaultsResult$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):54:55 -> a
+    8:9:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):62:63 -> a
+    10:11:void recordFieldPut(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedMethod):68:69 -> a
+    10:11:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):63 -> a
+    12:16:boolean verifyValueIsConsistentWithFieldOptimizationInfo(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo,com.android.tools.r8.graph.DexEncodedMethod):90:94 -> a
+    12:16:void recordFieldPut(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedMethod):68 -> a
+    12:16:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):63 -> a
+    17:18:void recordFieldPut(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedMethod):70:71 -> a
+    17:18:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):63 -> a
+    19:20:void waveDone(java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):83:84 -> a
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.t.a.l.b$a:
+    java.util.Map fieldWrites -> a
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():98:98 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):108:108 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.AppView):101:112 -> <init>
+    1:10:void lambda$new$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfo):114:123 -> a
+    11:11:java.util.List lambda$new$0(com.android.tools.r8.graph.DexEncodedMethod):122:122 -> a
+    12:12:void lambda$new$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):122:122 -> a
+    13:20:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):129:136 -> a
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.t.a.l.c:
+    1:1:void <init>():16:16 -> <init>
+    1:9:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):20:28 -> a
+    10:32:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):34:56 -> a
+    10:32:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29 -> a
+    33:33:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29:29 -> a
+    34:50:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):66:82 -> a
 com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.t.a.m.a:
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():25:25 -> <init>
@@ -20631,6 +20615,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> c
     boolean isKnownFieldSet() -> e
     1:5:boolean equals(java.lang.Object):82:86 -> equals
+    1:4:java.util.Set getFields():36:39 -> g
     1:1:int hashCode():74:74 -> hashCode
     1:1:int size():69:69 -> size
 com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.t.a.m.c:
@@ -20650,80 +20635,88 @@
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.code.IRCode code -> c
     java.util.Map fieldsMaybeReadBeforeBlockInclusiveCache -> f
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):60:67 -> <init>
-    1:8:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):72:79 -> a
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):61:68 -> <init>
+    1:8:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):77:84 -> a
     9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    9:9:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):79 -> a
-    10:25:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):79:94 -> a
-    26:26:boolean lambda$run$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):85:85 -> a
-    27:66:void computeFieldOptimizationInfo():106:145 -> a
-    67:68:boolean com.android.tools.r8.ir.code.DominatorTree.dominatesAllOf(com.android.tools.r8.ir.code.BasicBlock,java.lang.Iterable):118:119 -> a
-    67:68:void computeFieldOptimizationInfo():145 -> a
-    69:69:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):158:158 -> a
-    69:69:void computeFieldOptimizationInfo():149 -> a
-    70:70:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):184:184 -> a
-    70:70:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):161 -> a
-    70:70:void computeFieldOptimizationInfo():149 -> a
-    71:74:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():98:101 -> a
-    71:74:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):194 -> a
-    71:74:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):185 -> a
-    71:74:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):161 -> a
-    71:74:void computeFieldOptimizationInfo():149 -> a
-    75:75:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):194:194 -> a
-    75:75:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):185 -> a
-    75:75:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):161 -> a
-    75:75:void computeFieldOptimizationInfo():149 -> a
-    76:83:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):167:174 -> a
-    76:83:void computeFieldOptimizationInfo():149 -> a
-    84:84:void computeFieldOptimizationInfo():152:152 -> a
-    85:85:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):284:284 -> a
-    85:85:void computeFieldOptimizationInfo():152 -> a
-    86:87:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):312:313 -> a
-    86:87:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):285 -> a
-    86:87:void computeFieldOptimizationInfo():152 -> a
-    88:125:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):335:372 -> a
-    88:125:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):314 -> a
-    88:125:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):285 -> a
-    88:125:void computeFieldOptimizationInfo():152 -> a
-    126:128:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):363:365 -> a
-    126:128:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):314 -> a
-    126:128:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):285 -> a
-    126:128:void computeFieldOptimizationInfo():152 -> a
-    129:130:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):355:356 -> a
-    129:130:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):314 -> a
-    129:130:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):285 -> a
-    129:130:void computeFieldOptimizationInfo():152 -> a
-    131:136:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):393:398 -> a
-    131:136:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):356 -> a
-    131:136:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):314 -> a
-    131:136:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):285 -> a
-    131:136:void computeFieldOptimizationInfo():152 -> a
-    137:155:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):396:414 -> a
-    137:155:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):356 -> a
-    137:155:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):314 -> a
-    137:155:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):285 -> a
-    137:155:void computeFieldOptimizationInfo():152 -> a
-    156:156:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):389:389 -> a
-    156:156:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):314 -> a
-    156:156:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):285 -> a
-    156:156:void computeFieldOptimizationInfo():152 -> a
-    157:160:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):319:322 -> a
-    157:160:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):285 -> a
-    157:160:void computeFieldOptimizationInfo():152 -> a
-    161:161:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):286:286 -> a
-    161:161:void computeFieldOptimizationInfo():152 -> a
-    162:162:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
-    162:162:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):287 -> a
-    162:162:void computeFieldOptimizationInfo():152 -> a
-    163:164:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):288:289 -> a
-    163:164:void computeFieldOptimizationInfo():152 -> a
-    165:184:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):288:307 -> a
-    165:184:void computeFieldOptimizationInfo():152 -> a
-    185:185:java.util.LinkedList lambda$computeFieldOptimizationInfo$1(com.android.tools.r8.graph.DexEncodedField):123:123 -> a
-    186:186:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$2(com.android.tools.r8.ir.code.BasicBlock):209:209 -> a
-    1:75:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():202:276 -> b
+    9:9:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):84 -> a
+    10:25:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):84:99 -> a
+    26:26:boolean lambda$run$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):90:90 -> a
+    27:45:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):112:130 -> a
+    46:46:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    46:46:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):132 -> a
+    47:67:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):132:152 -> a
+    68:69:boolean com.android.tools.r8.ir.code.DominatorTree.dominatesAllOf(com.android.tools.r8.ir.code.BasicBlock,java.lang.Iterable):118:119 -> a
+    68:69:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):152 -> a
+    70:70:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):157:157 -> a
+    71:71:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):167:167 -> a
+    71:71:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):158 -> a
+    72:72:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):193:193 -> a
+    72:72:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):170 -> a
+    72:72:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):158 -> a
+    73:76:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():103:106 -> a
+    73:76:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):203 -> a
+    73:76:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):194 -> a
+    73:76:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):170 -> a
+    73:76:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):158 -> a
+    77:77:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):203:203 -> a
+    77:77:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):194 -> a
+    77:77:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):170 -> a
+    77:77:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):158 -> a
+    78:85:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):176:183 -> a
+    78:85:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):158 -> a
+    86:86:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161:161 -> a
+    87:87:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):312:312 -> a
+    87:87:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    88:89:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):340:341 -> a
+    88:89:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):313 -> a
+    88:89:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    90:127:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):363:400 -> a
+    90:127:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):342 -> a
+    90:127:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):313 -> a
+    90:127:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    128:130:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):391:393 -> a
+    128:130:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):342 -> a
+    128:130:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):313 -> a
+    128:130:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    131:132:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):383:384 -> a
+    131:132:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):342 -> a
+    131:132:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):313 -> a
+    131:132:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    133:138:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):421:426 -> a
+    133:138:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):384 -> a
+    133:138:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):342 -> a
+    133:138:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):313 -> a
+    133:138:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    139:157:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):424:442 -> a
+    139:157:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):384 -> a
+    139:157:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):342 -> a
+    139:157:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):313 -> a
+    139:157:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    158:158:com.android.tools.r8.ir.analysis.value.SingleEnumValue getSingleEnumValue(com.android.tools.r8.ir.code.Value):417:417 -> a
+    158:158:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):342 -> a
+    158:158:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):313 -> a
+    158:158:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    159:162:com.android.tools.r8.ir.analysis.value.AbstractValue computeAbstractValue(com.android.tools.r8.ir.code.Value):347:350 -> a
+    159:162:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):313 -> a
+    159:162:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    163:163:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):314:314 -> a
+    163:163:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    164:164:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    164:164:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):315 -> a
+    164:164:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    165:167:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):316:316 -> a
+    165:167:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    171:186:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):320:335 -> a
+    171:186:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):161 -> a
+    187:187:java.util.LinkedList lambda$computeFieldOptimizationInfo$1(com.android.tools.r8.graph.DexEncodedField):134:134 -> a
+    188:230:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():211:253 -> a
+    231:238:boolean verifyFieldSetContainsAllFieldReadsInBlock(com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):297:304 -> a
+    231:238:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():253 -> a
+    239:273:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():255:289 -> a
+    274:274:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$2(com.android.tools.r8.ir.code.BasicBlock):218:218 -> a
 com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.t.a.m.e:
+    boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     boolean isConcreteFieldSet() -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> b
 com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.t.a.m.f:
@@ -20746,41 +20739,43 @@
     1:1:void <clinit>():75:75 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):84:84 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):80:87 -> <init>
-    1:1:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):101:101 -> a
-    2:12:com.android.tools.r8.shaking.TreePrunerConfiguration createTreePrunerConfiguration(com.android.tools.r8.shaking.Enqueuer$Mode):111:121 -> a
-    2:12:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):102 -> a
-    13:16:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):130:133 -> a
-    17:28:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):138:149 -> a
-    29:29:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter):158:158 -> a
-    30:31:void lambda$postOptimizeGeneratedExtensionRegistry$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):162:163 -> a
-    32:32:void lambda$postOptimizeGeneratedExtensionRegistry$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):160:160 -> a
-    33:37:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):181:185 -> a
-    38:38:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):184:184 -> a
-    39:48:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):194:203 -> a
-    49:49:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    49:49:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):203 -> a
-    50:61:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):204:215 -> a
-    62:64:void forEachDeadProtoExtensionField(java.util.function.Consumer):219:221 -> a
-    65:67:void lambda$forEachDeadProtoExtensionField$1(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):223:225 -> a
-    68:98:void logRemainingProtoExtensionFields():232:262 -> a
-    99:115:void logRemainingProtoExtensionFields():259:275 -> a
-    116:119:void lambda$logRemainingProtoExtensionFields$2(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):237:240 -> a
-    120:130:void lambda$logRemainingProtoExtensionFields$2(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):237:247 -> a
-    131:131:void lambda$logRemainingProtoExtensionFields$2(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):245:245 -> a
-    132:134:void lambda$logRemainingProtoExtensionFields$3(java.lang.StringBuilder,com.android.tools.r8.graph.DexMethod):272:274 -> a
-    135:135:java.util.function.Predicate getSkipPredicate(java.nio.file.Path):316:316 -> a
-    1:2:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField):106:107 -> b
-    3:10:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):167:174 -> b
-    1:1:boolean wasRemoved(com.android.tools.r8.graph.DexField):154:154 -> c
+    1:2:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):101:102 -> a
+    3:13:com.android.tools.r8.shaking.TreePrunerConfiguration createTreePrunerConfiguration(com.android.tools.r8.shaking.Enqueuer$Mode):112:122 -> a
+    3:13:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):103 -> a
+    14:17:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):131:134 -> a
+    18:29:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):139:150 -> a
+    30:30:boolean wasRemoved(com.android.tools.r8.graph.DexField):155:155 -> a
+    30:30:boolean lambda$run$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):102 -> a
+    31:31:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter):159:159 -> a
+    32:33:void lambda$postOptimizeGeneratedExtensionRegistry$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):163:164 -> a
+    34:34:void lambda$postOptimizeGeneratedExtensionRegistry$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):161:161 -> a
+    35:39:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):182:186 -> a
+    40:40:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):185:185 -> a
+    41:50:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):195:204 -> a
+    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    51:51:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):204 -> a
+    52:63:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):205:216 -> a
+    64:66:void forEachDeadProtoExtensionField(java.util.function.Consumer):220:222 -> a
+    67:69:void lambda$forEachDeadProtoExtensionField$2(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):224:226 -> a
+    70:100:void logRemainingProtoExtensionFields():233:263 -> a
+    101:117:void logRemainingProtoExtensionFields():260:276 -> a
+    118:122:void lambda$logRemainingProtoExtensionFields$3(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):238:238 -> a
+    127:132:void lambda$logRemainingProtoExtensionFields$3(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):243:248 -> a
+    133:133:void lambda$logRemainingProtoExtensionFields$3(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):246:246 -> a
+    134:136:void lambda$logRemainingProtoExtensionFields$4(java.lang.StringBuilder,com.android.tools.r8.graph.DexEncodedMethod):273:275 -> a
+    137:137:java.util.function.Predicate getSkipPredicate(java.nio.file.Path):317:317 -> a
+    1:2:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField):107:108 -> b
+    3:10:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):168:175 -> b
+    1:1:boolean wasRemoved(com.android.tools.r8.graph.DexField):155:155 -> c
 com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.t.a.o.a:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> a
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):112:112 -> <init>
-    1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):117:117 -> isReachableOrReferencedField
+    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):113:113 -> <init>
+    1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):118:118 -> isReachableOrReferencedField
 com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$2 -> com.android.tools.r8.t.a.o.b:
     java.util.function.Predicate val$skip -> a
     java.util.Set val$remainingProtoExtensionFieldReads -> b
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker,com.android.tools.r8.graph.DexItemFactory,java.util.function.Predicate,java.util.Set):247:247 -> <init>
-    1:2:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):251:252 -> registerStaticFieldRead
+    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):248:248 -> <init>
+    1:2:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):252:253 -> registerStaticFieldRead
 com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.t.a.o.e:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -20792,28 +20787,28 @@
     11:20:void preprocessCallGraphBeforeCycleElimination(java.util.Map):77:86 -> a
     21:33:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):98:110 -> a
     34:34:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):144:144 -> a
-    35:35:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    35:35:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     35:35:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):145 -> a
     36:46:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):147:157 -> a
-    47:47:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):117:117 -> a
+    47:47:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):118:118 -> a
     47:47:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):158 -> a
     48:50:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):161:163 -> a
-    51:54:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):232:235 -> a
+    51:54:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):296:299 -> a
     51:54:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):163 -> a
-    55:55:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):228:228 -> a
-    55:55:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):235 -> a
+    55:55:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):292:292 -> a
+    55:55:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):299 -> a
     55:55:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):163 -> a
     56:60:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):167:171 -> a
     61:61:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.asMaybeNull():87:87 -> a
     61:61:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):172 -> a
     62:64:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):172:174 -> a
-    65:65:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):232:232 -> a
+    65:65:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):296:296 -> a
     65:65:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):163 -> a
     66:67:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):178:179 -> a
     68:68:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     68:68:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):179 -> a
     69:69:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):179:179 -> a
-    70:70:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    70:70:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     70:70:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):145 -> a
 com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.t.a.o.d:
     java.util.Set bypassClinitforInlining -> g
@@ -20865,7 +20860,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):133 -> a
     17:17:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
     17:17:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> 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):1045:1045 -> 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):1049:1049 -> 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):141 -> 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):133 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
@@ -20898,7 +20893,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):134 -> a
     26:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
     26:33:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> 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):1045:1045 -> 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):1049:1049 -> 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):161 -> 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):134 -> a
     34:34:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
@@ -20912,44 +20907,40 @@
     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):134 -> a
     37:37:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
     37:37:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
-    38: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):167:169 -> a
+    38: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):166:168 -> a
     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):134 -> a
     38:40:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
     38:40:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
     41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):29:29 -> 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):170 -> 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):169 -> 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):134 -> a
     41:41:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
     41:41:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
-    42: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):171:173 -> a
+    42: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):170:172 -> a
     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):134 -> a
     42:44:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
     42:44:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
     45:45:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):29:29 -> 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):171 -> 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):170 -> 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):134 -> a
     45:45:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
     45:45:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
-    46:53: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):175:182 -> a
-    46:53: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):134 -> a
-    46:53:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
-    46:53:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
-    54:56:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31:33 -> a
-    54:56: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):182 -> a
-    54:56: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):134 -> a
-    54:56:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
-    54:56:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
-    57:57: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):186:186 -> a
-    57:57: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):134 -> a
-    57:57:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
-    57:57:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
-    58:61:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119:122 -> a
-    58:61:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
-    62:62:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter):73:73 -> a
-    63:64:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):77:78 -> a
-    65:65:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):75:75 -> a
-    66:69:void forEachDynamicMethod(java.util.function.Consumer):82:85 -> a
-    70:73:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):191:194 -> a
+    46:46: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):177:177 -> a
+    46:46: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):134 -> a
+    46:46:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
+    46:46:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
+    47:49:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31:33 -> a
+    47:49: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):177 -> a
+    47:49: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):134 -> a
+    47:49:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):115 -> a
+    47:49:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
+    50:53:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119:122 -> a
+    50:53:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
+    54:54:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter):73:73 -> a
+    55:56:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):77:78 -> a
+    57:57:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):75:75 -> a
+    58:61:void forEachDynamicMethod(java.util.function.Consumer):82:85 -> a
+    62:65:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):182:185 -> a
 com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.t.a.o.g:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> b
@@ -20969,84 +20960,94 @@
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):39 -> a
     3:4:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):39:40 -> a
-    5:5:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):104:104 -> a
+    5:5:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):105:105 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):40 -> a
     6:14:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):41:49 -> a
     15:28:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):55:68 -> a
     15:28:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):48 -> a
-    29:29:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithSimpleBody(com.android.tools.r8.graph.DexField):239:239 -> a
+    29:29:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithSimpleBody(com.android.tools.r8.graph.DexField):303:303 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):69 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):48 -> a
     30:33:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):70:73 -> a
     30:33:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):48 -> a
-    34:34:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithNonSimpleBody(com.android.tools.r8.graph.DexField):247:247 -> a
+    34:34:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithNonSimpleBody(com.android.tools.r8.graph.DexField):311:311 -> a
     34:34:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):74 -> a
     34:34:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):48 -> a
     35:38:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):73:76 -> a
     35:38:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):48 -> a
-    39:39:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):104:104 -> a
+    39:39:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):105:105 -> a
     39:39:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):40 -> a
 com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.t.a.o.i:
-    com.android.tools.r8.graph.DexString newBuilderMethodName -> p
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods generatedMessageLiteBuilderMethods -> k
-    com.android.tools.r8.graph.DexType methodToInvokeType -> i
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods generatedMessageLiteMethods -> j
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers methodToInvokeMembers -> m
-    com.android.tools.r8.graph.DexProto dynamicMethodProto -> q
-    com.android.tools.r8.graph.DexProto findLiteExtensionByNumberProto -> r
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods generatedMessageLiteExtendableBuilderMethods -> l
-    com.android.tools.r8.graph.DexType generatedMessageLiteType -> d
-    com.android.tools.r8.graph.DexType generatedExtensionType -> c
-    com.android.tools.r8.graph.DexType extensionRegistryLiteType -> b
-    com.android.tools.r8.graph.DexType extendableMessageType -> a
-    com.android.tools.r8.graph.DexMethod rawMessageInfoConstructor -> t
-    com.android.tools.r8.graph.DexType messageLiteType -> h
-    com.android.tools.r8.graph.DexMethod newMessageInfoMethod -> s
-    com.android.tools.r8.graph.DexType rawMessageInfoType -> g
-    com.android.tools.r8.graph.DexType generatedMessageLiteExtendableBuilderType -> f
-    com.android.tools.r8.graph.DexString dynamicMethodName -> n
-    com.android.tools.r8.graph.DexType generatedMessageLiteBuilderType -> e
-    com.android.tools.r8.graph.DexString findLiteExtensionByNumberName -> o
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):45:49 -> <init>
-    6:12:void <init>(com.android.tools.r8.graph.DexItemFactory):48:54 -> <init>
-    13:19:void <init>(com.android.tools.r8.graph.DexItemFactory):53:59 -> <init>
-    20:24:void <init>(com.android.tools.r8.graph.DexItemFactory):58:62 -> <init>
-    25:32:void <init>(com.android.tools.r8.graph.DexItemFactory):61:68 -> <init>
-    33:54:void <init>(com.android.tools.r8.graph.DexItemFactory):67:88 -> <init>
-    55:63:void <init>(com.android.tools.r8.graph.DexItemFactory):84:92 -> <init>
-    64:74:void <init>(com.android.tools.r8.graph.DexItemFactory):90:100 -> <init>
-    1:1:boolean isDynamicMethod(com.android.tools.r8.graph.DexMethod):109:109 -> a
-    2:2:boolean isDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod):113:113 -> a
-    3:3:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):130:130 -> a
-    4:4:boolean isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):104:104 -> a
-    4:4:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):132 -> a
-    1:1:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):121:121 -> b
-    2:2:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):117:117 -> b
-    2:2:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):121 -> b
-    3:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):125:126 -> b
-    1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):136:136 -> c
+    com.android.tools.r8.graph.DexType wireFormatFieldType -> l
+    com.android.tools.r8.graph.DexType methodToInvokeType -> k
+    com.android.tools.r8.graph.DexType messageLiteType -> j
+    com.android.tools.r8.graph.DexString dynamicMethodName -> r
+    com.android.tools.r8.graph.DexType rawMessageInfoType -> i
+    com.android.tools.r8.graph.DexString findLiteExtensionByNumberName -> s
+    com.android.tools.r8.graph.DexString newBuilderMethodName -> t
+    com.android.tools.r8.graph.DexProto dynamicMethodProto -> u
+    com.android.tools.r8.graph.DexProto findLiteExtensionByNumberProto -> v
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods generatedMessageLiteExtendableBuilderMethods -> p
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers methodToInvokeMembers -> q
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods generatedExtensionMethods -> m
+    com.android.tools.r8.graph.DexMethod rawMessageInfoConstructor -> x
+    com.android.tools.r8.graph.DexType extensionRegistryLiteType -> d
+    com.android.tools.r8.graph.DexMethod newMessageInfoMethod -> w
+    com.android.tools.r8.graph.DexType extensionDescriptorType -> c
+    com.android.tools.r8.graph.DexType extendableMessageType -> b
+    com.android.tools.r8.graph.DexType enumLiteMapType -> a
+    com.android.tools.r8.graph.DexType generatedMessageLiteExtendableBuilderType -> h
+    com.android.tools.r8.graph.DexType generatedMessageLiteBuilderType -> g
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods generatedMessageLiteBuilderMethods -> o
+    com.android.tools.r8.graph.DexType generatedMessageLiteType -> f
+    com.android.tools.r8.graph.DexType generatedExtensionType -> e
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods generatedMessageLiteMethods -> n
+    1:40:void <init>(com.android.tools.r8.graph.DexItemFactory):49:88 -> <init>
+    41:49:void <init>(com.android.tools.r8.graph.DexItemFactory):84:92 -> <init>
+    50:61:void <init>(com.android.tools.r8.graph.DexItemFactory):90:101 -> <init>
+    1:1:boolean isDynamicMethod(com.android.tools.r8.graph.DexMethod):110:110 -> a
+    2:2:boolean isDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod):114:114 -> a
+    3:3:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):132:132 -> a
+    4:4:boolean isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):105:105 -> a
+    4:4:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):134 -> a
+    1:1:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):122:122 -> b
+    2:2:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):118:118 -> b
+    2:2:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):122 -> b
+    3:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):126:127 -> b
+    1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):138:138 -> c
 com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.t.a.o.i$a:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.t.a.o.i$b:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.t.a.o.i$b:
+    com.android.tools.r8.graph.DexMethod constructorWithClass -> b
+    com.android.tools.r8.graph.DexMethod constructor -> a
+    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):141:141 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):146:150 -> <init>
+    7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):148:160 -> <init>
+    20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):158:158 -> <init>
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.t.a.o.i$c:
     com.android.tools.r8.graph.DexMethod constructorMethod -> a
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):164:164 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):169:173 -> <init>
-    7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):171:178 -> <init>
-    15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):176:176 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.t.a.o.i$c:
+    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):228:228 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):233:237 -> <init>
+    7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):235:242 -> <init>
+    15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):240:240 -> <init>
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.t.a.o.i$d:
     com.android.tools.r8.graph.DexMethod buildPartialMethod -> a
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):183:183 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):187:191 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):189:189 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.t.a.o.i$d:
+    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):247:247 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):251:255 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):253:253 -> <init>
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.t.a.o.i$e:
+    com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> e
+    com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod isInitializedMethod -> c
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethod -> b
     com.android.tools.r8.graph.DexMethod createBuilderMethod -> a
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):139:139 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):145:149 -> <init>
-    7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):147:154 -> <init>
-    15:22:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):152:159 -> <init>
-    23:23:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):157:157 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.t.a.o.i$e:
+    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):175:175 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):183:187 -> <init>
+    7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):185:192 -> <init>
+    15:22:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):190:197 -> <init>
+    23:30:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):195:202 -> <init>
+    31:46:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):200:215 -> <init>
+    47:47:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):213:213 -> <init>
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.t.a.o.i$f:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -21054,8 +21055,8 @@
     com.android.tools.r8.graph.DexField buildMessageInfoField -> a
     com.android.tools.r8.graph.DexField getParserField -> d
     com.android.tools.r8.graph.DexField getMemoizedIsInitializedField -> c
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):196:196 -> <init>
-    2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):206:223 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):260:260 -> <init>
+    2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):270:287 -> <init>
 com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.t.a.o.j:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> e
@@ -21088,7 +21089,7 @@
     83:120:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):147:184 -> a
     121:127:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):181:187 -> a
     128:136:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):194:202 -> a
-    137:138:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):541:542 -> a
+    137:138:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):554:555 -> a
     137:138:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):202 -> a
     139:158:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):204:223 -> a
     159:159:boolean com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo.isForFieldName():0:0 -> a
@@ -21159,7 +21160,7 @@
     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):1045:1045 -> 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):1049:1049 -> 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() -> f
@@ -21168,65 +21169,84 @@
 com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.t.a.o.o.c:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
+    java.util.Set findLiteExtensionByNumberMethods -> i
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
-    boolean $assertionsDisabled -> i
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> b
+    java.util.Map extensionGraph -> j
     java.util.Map liveProtos -> e
     java.util.Map seenButNotLiveProtos -> f
     java.util.Map reachesMapOrRequiredFieldFromMessageCache -> g
-    1:1:void <clinit>():46:46 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):71:71 -> <init>
-    2:24:void <init>(com.android.tools.r8.graph.AppView):54:76 -> <init>
-    boolean lambda$markMapOrRequiredFieldsAsReachable$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod) -> a
-    1:15:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):85:99 -> a
-    16:19:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):104:107 -> a
-    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    20:20:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):107 -> a
-    21:35:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):108:122 -> a
-    36:36:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):111:111 -> a
-    37:46:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):127:136 -> a
-    47:72:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):252:277 -> a
-    47:72:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):137 -> a
-    73:77:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):276:280 -> a
-    73:77:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):137 -> a
-    78:78:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):279:279 -> a
-    78:78:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):137 -> a
-    79:92:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):303:316 -> a
-    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    93:93:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):316 -> a
-    94:129:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):317:352 -> a
-    130:130:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):351:351 -> a
-    131:131:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):318:318 -> a
-    132:149:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):362:379 -> a
-    150:153:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):391:394 -> a
-    150:153:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):380 -> a
-    154:154:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> a
-    154:154:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):396 -> a
-    154:154:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):380 -> a
-    155:168:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):395:408 -> a
-    155:168:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):380 -> a
-    169:177:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):417:425 -> a
-    178:178:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    178:178:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):425 -> a
-    179:192:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):426:439 -> a
-    193:193:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):427:427 -> a
-    1:7:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):150:156 -> b
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
-    8:8:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):156 -> b
-    9:34:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):156:181 -> b
-    35:69:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):180:214 -> b
-    70:71:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):135:136 -> b
-    70:71:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):215 -> b
-    72:72:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):216:216 -> b
-    73:73:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> b
-    73:73:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):228 -> b
-    74:86:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):229:241 -> b
-    87:87:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):240:240 -> b
-    88:88:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> b
-    88:88:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):228 -> b
-    89:94:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):291:296 -> b
-    89:94:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):246 -> b
+    1:1:void <clinit>():53:53 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):84:84 -> <init>
+    2:30:void <init>(com.android.tools.r8.graph.AppView):61:89 -> <init>
+    boolean lambda$markMapOrRequiredFieldsAsReachable$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod) -> a
+    1:20:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):98:117 -> a
+    21:24:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):122:125 -> a
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    25:25:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):125 -> a
+    26:40:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):126:140 -> a
+    41:41:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):129:129 -> a
+    42:53:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):145:156 -> a
+    54:79:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):432:457 -> a
+    54:79:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):157 -> a
+    80:84:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):456:460 -> a
+    80:84:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):157 -> a
+    85:85:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):459:459 -> a
+    85:85:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):157 -> a
+    86:110:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):188:212 -> a
+    111:127:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):191:207 -> a
+    128:128:java.util.Set lambda$collectExtensionFields$1(com.android.tools.r8.graph.DexProgramClass):252:252 -> a
+    129:137:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):271:279 -> a
+    138:144:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):41:47 -> a
+    138:144:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):279 -> a
+    145:162:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):281:298 -> a
+    163:163:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):171:171 -> a
+    163:163:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):298 -> a
+    164:181:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):299:316 -> a
+    182:185:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):315:318 -> a
+    186:186:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):310:310 -> a
+    187:200:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):483:496 -> a
+    201:201:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    201:201:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):496 -> a
+    202:237:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):497:532 -> a
+    238:238:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):531:531 -> a
+    239:239:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):498:498 -> a
+    240:258:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):542:560 -> a
+    259:263:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):571:575 -> a
+    264:264:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> a
+    264:264:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):577 -> a
+    265:291:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):576:602 -> a
+    292:300:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):611:619 -> a
+    301:301:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    301:301:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):619 -> a
+    302:315:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):620:633 -> a
+    316:316:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):621:621 -> a
+    1:5:java.util.Map collectExtensionFields():220:224 -> b
+    6:28:java.util.Map collectExtensionFields():223:245 -> b
+    29:29:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
+    29:29:java.util.Map collectExtensionFields():245 -> b
+    30:44:java.util.Map collectExtensionFields():245:259 -> b
+    45:45:java.util.Map collectExtensionFields():258:258 -> b
+    46:46:java.util.Map collectExtensionFields():257:257 -> b
+    47:47:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$2(com.android.tools.r8.graph.DexType):317:317 -> b
+    48:54:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):330:336 -> b
+    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
+    55:55:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):336 -> b
+    56:81:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):336:361 -> b
+    82:116:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):360:394 -> b
+    117:118:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):135:136 -> b
+    117:118:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):395 -> b
+    119:119:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):396:396 -> b
+    120:120:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> b
+    120:120:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):408 -> b
+    121:133:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):409:421 -> b
+    134:134:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):420:420 -> b
+    135:135:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> b
+    135:135:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):408 -> b
+    136:141:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):471:476 -> b
+    136:141:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):426 -> b
 com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.t.a.o.o.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
@@ -21299,20 +21319,21 @@
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
     java.util.LinkedList fields -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,int,java.util.LinkedList,java.util.LinkedList,java.util.LinkedList,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1):18:18 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexEncodedMethod,int,java.util.LinkedList,java.util.LinkedList,java.util.LinkedList):185:190 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):194:194 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod getDynamicMethod():202:202 -> a
-    1:1:java.util.List getFields():206:206 -> b
-    1:1:int getFlags():210:210 -> c
-    1:1:java.util.List getHasBitsObjects():214:214 -> d
-    1:1:java.util.List getOneOfObjects():218:218 -> e
-    1:1:boolean hasFields():222:222 -> f
-    1:1:boolean isProto2():198:198 -> g
-    1:1:int numberOfFields():226:226 -> h
-    1:1:int numberOfHasBitsObjects():230:230 -> i
-    1:1:int numberOfOneOfObjects():234:234 -> j
-    1:9:java.lang.String toString():239:247 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,int,java.util.LinkedList,java.util.LinkedList,java.util.LinkedList,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1):19:19 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexEncodedMethod,int,java.util.LinkedList,java.util.LinkedList,java.util.LinkedList):186:191 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):195:195 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod getDynamicMethod():203:203 -> a
+    1:1:java.util.List getFields():207:207 -> b
+    1:1:int getFlags():211:211 -> c
+    1:1:java.util.List getHasBitsObjects():215:215 -> d
+    1:1:java.util.List getOneOfObjects():219:219 -> e
+    1:1:com.android.tools.r8.graph.DexType getType():223:223 -> f
+    1:1:boolean hasFields():227:227 -> g
+    1:1:boolean isProto2():199:199 -> h
+    1:1:int numberOfFields():231:231 -> i
+    1:1:int numberOfHasBitsObjects():235:235 -> j
+    1:1:int numberOfOneOfObjects():239:239 -> k
+    1:9:java.lang.String toString():244:252 -> toString
 com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.t.a.o.o.h:
 com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.t.a.o.o.i$a:
     com.android.tools.r8.graph.DexEncodedMethod dynamicMethod -> a
@@ -21321,21 +21342,21 @@
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
     java.util.LinkedList fields -> c
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1):22:22 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):32:33 -> <init>
-    1:1:void setFlags(int):37:37 -> a
-    2:5:void addField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):41:44 -> a
-    6:9:void addHasBitsObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):48:51 -> a
-    10:13:void addOneOfObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):55:58 -> a
-    14:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo build():62:64 -> a
-    17:17:boolean lambda$removeUnusedSharedData$1(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair):131:131 -> a
-    1:10:void removeDeadFields():68:77 -> b
-    11:14:boolean lambda$removeDeadFields$0(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):72:75 -> b
-    1:48:void removeUnusedSharedData():82:129 -> c
-    49:86:void removeUnusedSharedData():128:165 -> c
-    87:87:void removeUnusedSharedData():164:164 -> c
-    88:89:void removeUnusedSharedData():83:84 -> c
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1):23:23 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):33:34 -> <init>
+    1:1:void setFlags(int):38:38 -> a
+    2:5:void addField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):42:45 -> a
+    6:9:void addHasBitsObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):49:52 -> a
+    10:13:void addOneOfObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):56:59 -> a
+    14:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo build():63:65 -> a
+    17:17:boolean lambda$removeUnusedSharedData$1(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair):132:132 -> a
+    1:10:void removeDeadFields():69:78 -> b
+    11:14:boolean lambda$removeDeadFields$0(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):73:76 -> b
+    1:48:void removeUnusedSharedData():83:130 -> c
+    49:86:void removeUnusedSharedData():129:166 -> c
+    87:87:void removeUnusedSharedData():165:165 -> c
+    88:89:void removeUnusedSharedData():84:85 -> c
 com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.t.a.o.o.j:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
@@ -21353,14 +21374,14 @@
     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):1045:1045 -> 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):1049:1049 -> 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.t.a.o.o.l:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:32 -> a
-    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):1045:1045 -> 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):1049:1049 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):33:33 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet asProtoObjectFromStaticGet() -> c
@@ -21391,12 +21412,12 @@
     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):1082:1082 -> 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):1086:1086 -> 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):1045:1045 -> 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):1082 -> 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):1049: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):1086 -> 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):1083:1083 -> 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):1087:1087 -> 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() -> d
     boolean isProtoTypeObject() -> i
@@ -21408,15 +21429,15 @@
     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.ir.analysis.type.a:
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> r
-    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> s
-    boolean $assertionsDisabled -> t
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> e
+    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> f
+    boolean $assertionsDisabled -> g
     1:1:void <clinit>():15:15 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):33:36 -> <init>
-    1:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():70:72 -> G
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> H
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():66:66 -> I
-    1:4:int getNesting():53:56 -> J
+    1:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():70:72 -> T
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> U
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():66:66 -> V
+    1:4:int getNesting():53:56 -> W
     com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement asArrayTypeLatticeElement() -> a
     1:1:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement create(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability):24:24 -> a
     2:2:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement lambda$create$0(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):26:26 -> a
@@ -21429,108 +21450,110 @@
     25:36:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):146:157 -> a
     37:47:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):167:177 -> a
     48:60:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):173:185 -> a
-    61:63:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):349:351 -> a
+    61:63:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):385:387 -> a
     61:63:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):188 -> a
-    64:66:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):350:352 -> a
+    64:66:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):386:388 -> a
     64:66:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):188 -> a
-    67:68:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):344:345 -> a
+    67:68:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):380:381 -> a
     67:68:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):186 -> a
-    boolean isArrayType() -> e
     1:8:boolean equals(java.lang.Object):117:124 -> equals
     1:1:int hashCode():129:129 -> hashCode
+    boolean isArrayType() -> r
     1:1:java.lang.String toString():109:109 -> toString
 com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.b:
-    com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement INSTANCE -> q
+    com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement INSTANCE -> d
     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 -> E
-    boolean isBoolean() -> f
+    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getInstance():11:11 -> R
     1:1:int hashCode():31:31 -> hashCode
+    boolean isBoolean() -> s
 com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.c:
-    com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement INSTANCE -> o
+    com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement INSTANCE -> b
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> A
-    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():15:15 -> C
-    boolean isBottom() -> g
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> N
+    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():15:15 -> P
     1:1:int hashCode():35:35 -> hashCode
+    boolean isBottom() -> t
 com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.d:
-    com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement INSTANCE -> q
+    com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement INSTANCE -> d
     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 -> E
-    boolean isByte() -> h
+    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getInstance():11:11 -> R
     1:1:int hashCode():31:31 -> hashCode
+    boolean isByte() -> u
 com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.e:
-    com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement INSTANCE -> q
+    com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement INSTANCE -> d
     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 -> E
+    1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getInstance():11:11 -> R
     1:1:int hashCode():31:31 -> hashCode
-    boolean isChar() -> i
+    boolean isChar() -> v
 com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.f:
-    com.android.tools.r8.graph.AppView appView -> s
-    boolean $assertionsDisabled -> v
-    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> t
-    java.util.Set lazyInterfaces -> r
-    com.android.tools.r8.graph.DexType type -> u
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):56:62 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asMeetWithNotNull():120:120 -> E
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asMeetWithNotNull():23 -> E
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asMeetWithNotNull():120:120 -> G
-    1:1:com.android.tools.r8.graph.DexType getClassType():66:66 -> H
-    1:8:java.util.Set getInterfaces():70:77 -> I
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):23:23 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):23:23 -> a
-    3:4:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):35:36 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants):39:39 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):47:47 -> a
-    7:8:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):82:83 -> a
-    9:11:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):103:105 -> a
-    12:12:boolean lambda$isBasedOnMissingClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:105 -> a
-    13:22:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):194:203 -> a
-    23:44:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):198:219 -> a
-    45:48:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):240:243 -> a
-    49:49:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
-    49:49:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):243 -> a
-    50:54:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):243:247 -> a
-    55:55:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object) -> a
-    55:55:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):247 -> a
-    56:83:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):247:274 -> a
-    84:84:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    84:84:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):276 -> a
-    85:124:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):278:317 -> a
-    125:125:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
-    125:125:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):247 -> a
-    126:126:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
-    126:126:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):243 -> a
-    127:127:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):241:241 -> a
-    128:128:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$3(com.android.tools.r8.graph.DexType):263:263 -> a
+    boolean $assertionsDisabled -> i
+    java.util.Set lazyInterfaces -> e
+    com.android.tools.r8.graph.AppView appView -> f
+    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> g
+    com.android.tools.r8.graph.DexType type -> h
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):59:65 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asMeetWithNotNull():123:123 -> R
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asMeetWithNotNull():26 -> R
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asMeetWithNotNull():123:123 -> T
+    1:1:com.android.tools.r8.graph.DexType getClassType():69:69 -> U
+    1:8:java.util.Set getInterfaces():73:80 -> V
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):26:26 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):26:26 -> a
+    3:4:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):38:39 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants):42:42 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):50:50 -> a
+    7:8:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):85:86 -> a
+    9:11:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):106:108 -> a
+    12:12:boolean lambda$isBasedOnMissingClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:108 -> a
+    13:22:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):197:206 -> a
+    23:32:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):201:210 -> a
+    33:44:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):209:220 -> a
+    45:74:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):245:274 -> a
+    75:78:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):284:287 -> a
+    79:79:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    79:79:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):287 -> a
+    80:84:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):287:291 -> a
+    85:85:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    85:85:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):291 -> a
+    86:113:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):291:318 -> a
+    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    114:114:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):320 -> a
+    115:154:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):322:361 -> a
+    155:155:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    155:155:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):291 -> a
+    156:156:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    156:156:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):287 -> a
+    157:157:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):285:285 -> a
+    158:158:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$3(com.android.tools.r8.graph.DexType):307:307 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asClassTypeLatticeElement() -> b
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):44:45 -> b
-    3:7:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):93:97 -> b
-    8:22:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):147:161 -> b
+    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):47:48 -> b
+    3:7:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):96:100 -> b
+    8:22:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):150:164 -> b
     23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
-    23:23:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):164 -> b
-    24:26:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):165:167 -> b
+    23:23:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):167 -> b
+    24:26:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):168:170 -> b
     27:27:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    27:27:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):167 -> b
-    28:48:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):167:187 -> b
-    49:49:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$4(com.android.tools.r8.graph.DexType):279:279 -> b
-    1:19:boolean equals(java.lang.Object):327:345 -> equals
-    1:1:int hashCode():141:141 -> hashCode
-    boolean isClassType() -> j
-    1:11:java.lang.String toString():125:135 -> toString
+    27:27:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):170 -> b
+    28:48:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):170:190 -> b
+    49:49:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$4(com.android.tools.r8.graph.DexType):323:323 -> b
+    1:19:boolean equals(java.lang.Object):371:389 -> equals
+    1:1:int hashCode():144:144 -> hashCode
+    1:11:java.lang.String toString():128:138 -> toString
+    boolean isClassType() -> w
 com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker -> com.android.tools.r8.ir.analysis.type.f$a:
     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>():223:224 -> <clinit>
-    1:1:void <init>(java.lang.String,int):222:222 -> <init>
+    1:2:void <clinit>():224:225 -> <clinit>
+    1:1:void <init>(java.lang.String,int):223:223 -> <init>
 com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceWithMarker -> com.android.tools.r8.ir.analysis.type.f$b:
     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):231:233 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker):232:234 -> <init>
 com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.ir.analysis.type.g:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -21554,33 +21577,33 @@
     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.ir.analysis.type.h:
-    com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> q
+    com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> d
     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 -> E
+    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getInstance():11:11 -> R
     1:1:int hashCode():26:26 -> hashCode
-    boolean isDouble() -> m
+    boolean isDouble() -> z
 com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.i:
-    com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement INSTANCE -> q
+    com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement INSTANCE -> d
     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 -> E
+    boolean isFloat() -> B
+    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getInstance():10:10 -> R
     1:1:int hashCode():25:25 -> hashCode
-    boolean isFloat() -> o
 com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.j:
-    com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement INSTANCE -> q
+    com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement INSTANCE -> d
     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 -> E
+    boolean isInt() -> C
+    1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInstance():10:10 -> R
     1:1:int hashCode():25:25 -> hashCode
-    boolean isInt() -> p
 com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.k:
-    com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement INSTANCE -> q
+    com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement INSTANCE -> d
     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 -> E
+    boolean isLong() -> D
+    1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getInstance():11:11 -> R
     1:1:int hashCode():26:26 -> hashCode
-    boolean isLong() -> q
 com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.ir.analysis.type.l:
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NULL -> a
     com.android.tools.r8.ir.analysis.type.Nullability BOTTOM -> d
@@ -21615,11 +21638,12 @@
     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.ir.analysis.type.n:
-    boolean $assertionsDisabled -> o
+    boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():15:15 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> A
-    1:8:boolean hasDexType():66:73 -> C
+    boolean isPrimitive() -> H
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> N
+    1:8:boolean hasDexType():66:73 -> P
     1:25:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):38:62 -> a
     26:39:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):115:128 -> a
     40:40:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):126:126 -> a
@@ -21627,11 +21651,10 @@
     42:42:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):122:122 -> a
     43:43:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):120:120 -> a
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> c
-    boolean isPrimitive() -> u
 com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.o:
-    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
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_INSTANCE -> c
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_BOTTOM_INSTANCE -> d
+    com.android.tools.r8.ir.analysis.type.Nullability nullability -> b
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.create():23:23 -> <clinit>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.access$200():11 -> <clinit>
     1:1:void <clinit>():57 -> <clinit>
@@ -21641,45 +21664,45 @@
     3:3:void <clinit>():59 -> <clinit>
     4:4:void <clinit>():59:59 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):63:64 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():69:69 -> A
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$000():9:9 -> C
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$100():9:9 -> D
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asMeetWithNotNull():79:79 -> E
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getNullTypeLatticeElement():73:73 -> F
+    boolean isReference() -> I
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():69:69 -> N
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$000():9:9 -> P
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$100():9:9 -> Q
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asMeetWithNotNull():79:79 -> R
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getNullTypeLatticeElement():73:73 -> S
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability) -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement asReferenceTypeLatticeElement() -> d
     1:1:boolean equals(java.lang.Object):102:102 -> equals
     1:1:int hashCode():107:107 -> hashCode
-    boolean isReference() -> v
 com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement -> com.android.tools.r8.ir.analysis.type.o$a:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
+    boolean isNullType() -> E
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():42:42 -> hashCode
-    boolean isNullType() -> r
     1:1:java.lang.String toString():37:37 -> toString
 com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.p:
-    com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement INSTANCE -> q
+    com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement INSTANCE -> d
     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 -> E
+    boolean isShort() -> J
+    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getInstance():11:11 -> R
     1:1:int hashCode():31:31 -> hashCode
-    boolean isShort() -> w
 com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.q:
-    com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement INSTANCE -> p
+    com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement INSTANCE -> c
     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 -> D
+    boolean isSinglePrimitive() -> K
+    1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement getInstance():17:17 -> Q
     1:1:int hashCode():37:37 -> hashCode
-    boolean isSinglePrimitive() -> x
 com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.r:
-    com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement INSTANCE -> o
+    com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement INSTANCE -> b
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> A
-    1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():15:15 -> C
+    boolean isTop() -> L
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> N
+    1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():15:15 -> P
     1:1:int hashCode():35:35 -> hashCode
-    boolean isTop() -> y
 com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.ir.analysis.type.t:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
@@ -21712,110 +21735,111 @@
     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.ir.analysis.type.u:
-    com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement FLOAT -> h
-    boolean $assertionsDisabled -> n
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL -> m
-    com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement INT -> g
-    com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement BYTE -> d
-    com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement CHAR -> f
-    com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement TOP -> b
-    com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement DOUBLE -> k
-    com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement SINGLE -> i
-    com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement BOTTOM -> a
-    com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement WIDE -> l
-    com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement BOOLEAN -> c
-    com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement SHORT -> e
-    com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement LONG -> j
-    1:17:void <clinit>():18:34 -> <clinit>
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():18:18 -> <init>
-    com.android.tools.r8.ir.analysis.type.Nullability nullability() -> A
-    1:1:int requiredRegisters():338:338 -> B
+    1:4:boolean isFineGrainedType():342:345 -> A
+    boolean isFloat() -> B
+    boolean isInt() -> C
+    boolean isLong() -> D
+    boolean isNullType() -> E
+    1:1:boolean isNullable():78:78 -> F
+    1:8:boolean isPreciseType():331:338 -> G
+    boolean isPrimitive() -> H
+    boolean isReference() -> I
+    boolean isShort() -> J
+    boolean isSinglePrimitive() -> K
+    boolean isTop() -> L
+    boolean isWidePrimitive() -> M
+    com.android.tools.r8.ir.analysis.type.Nullability nullability() -> N
+    1:1:int requiredRegisters():374:374 -> O
     com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement asArrayTypeLatticeElement() -> a
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView) -> a
     boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView) -> a
-    1:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):58:69 -> a
+    1:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):94:105 -> a
     13:25:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.join(com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement):136:148 -> a
-    13:25:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):69 -> a
+    13:25:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):105 -> a
     26:26:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.join(com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement):0:0 -> a
-    26:26:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):69 -> a
-    27:43:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):70:86 -> a
-    44:45:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):344:345 -> a
-    44:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):87 -> a
-    46:54:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):90:98 -> a
-    55:55:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):65:65 -> a
-    56:58:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(java.lang.Iterable,com.android.tools.r8.graph.AppView):103:105 -> a
-    59:67:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):183:191 -> a
-    68:69:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):357:358 -> a
-    70:70: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
-    71:75: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,boolean):374:378 -> a
+    26:26:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):105 -> a
+    27:43:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):106:122 -> a
+    44:45:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):380:381 -> a
+    44:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):123 -> a
+    46:54:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):126:134 -> a
+    55:55:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):101:101 -> a
+    56:58:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(java.lang.Iterable,com.android.tools.r8.graph.AppView):139:141 -> a
+    59:67:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):219:227 -> a
+    68:69:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):393:394 -> a
+    70:70: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):405:405 -> a
+    71:75: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,boolean):410:414 -> a
     76:77:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):33:34 -> a
-    76:77: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,boolean):379 -> a
+    76:77: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,boolean):415 -> a
     78:78:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):110:110 -> a
     78:78:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    78:78: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,boolean):379 -> a
+    78:78: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,boolean):415 -> a
     79:106:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):81:108 -> a
     79:106:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    79:106: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,boolean):379 -> a
+    79:106: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,boolean):415 -> a
     107:107:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):104:104 -> a
     107:107:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    107:107: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,boolean):379 -> a
+    107:107: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,boolean):415 -> a
     108:112:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):102:106 -> a
     108:112:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    108:112: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,boolean):379 -> a
+    108:112: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,boolean):415 -> a
     113:127:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):86:100 -> a
     113:127:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    113:127: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,boolean):379 -> a
-    128:128: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,boolean):381:381 -> a
+    113:127: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,boolean):415 -> a
+    128:128: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,boolean):417:417 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asClassTypeLatticeElement() -> b
-    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):135:135 -> b
-    2:3:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):344:345 -> b
+    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):171:171 -> b
+    2:3:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):380:381 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> c
-    1:22:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):149:170 -> c
-    23:24:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):363:364 -> c
+    1:22:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):185:206 -> c
+    23:24:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):399:400 -> c
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement asReferenceTypeLatticeElement() -> d
-    1:5:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):119:123 -> d
-    boolean isArrayType() -> e
-    boolean isBoolean() -> f
-    boolean isBottom() -> g
-    boolean isByte() -> h
-    boolean isChar() -> i
-    boolean isClassType() -> j
-    1:1:boolean isDefinitelyNotNull():334:334 -> k
-    1:1:boolean isDefinitelyNull():330:330 -> l
-    boolean isDouble() -> m
-    1:4:boolean isFineGrainedType():306:309 -> n
-    boolean isFloat() -> o
-    boolean isInt() -> p
-    boolean isLong() -> q
-    boolean isNullType() -> r
-    1:1:boolean isNullable():42:42 -> s
-    1:8:boolean isPreciseType():295:302 -> t
-    boolean isPrimitive() -> u
-    boolean isReference() -> v
-    boolean isShort() -> w
-    boolean isSinglePrimitive() -> x
-    boolean isTop() -> y
-    boolean isWidePrimitive() -> z
+    1:5:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):155:159 -> d
+    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getBoolean():29:29 -> e
+    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getBottom():21:21 -> f
+    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getByte():33:33 -> g
+    1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getChar():41:41 -> h
+    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getDouble():61:61 -> i
+    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getFloat():49:49 -> j
+    1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInt():45:45 -> k
+    1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getLong():57:57 -> l
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getNull():69:69 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getShort():37:37 -> n
+    1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement getSingle():53:53 -> o
+    1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getTop():25:25 -> p
+    1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement getWide():65:65 -> q
+    boolean isArrayType() -> r
+    boolean isBoolean() -> s
+    boolean isBottom() -> t
+    boolean isByte() -> u
+    boolean isChar() -> v
+    boolean isClassType() -> w
+    1:1:boolean isDefinitelyNotNull():370:370 -> x
+    1:1:boolean isDefinitelyNull():366:366 -> y
+    boolean isDouble() -> z
 com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.v:
-    com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement INSTANCE -> p
+    com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement INSTANCE -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():13:13 -> <init>
-    int requiredRegisters() -> B
-    1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement getInstance():17:17 -> D
+    boolean isWidePrimitive() -> M
+    int requiredRegisters() -> O
+    1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement getInstance():17:17 -> Q
     1:1:int hashCode():42:42 -> hashCode
-    boolean isWidePrimitive() -> z
 com.android.tools.r8.ir.analysis.value.AbstractValue -> com.android.tools.r8.t.a.q.a:
     1:1:void <init>():7:7 -> <init>
-    com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> a
-    com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue() -> b
-    com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> c
-    boolean isNonTrivial() -> d
-    boolean isSingleEnumValue() -> e
-    boolean isSingleFieldValue() -> f
-    boolean isSingleNumberValue() -> g
-    boolean isSingleStringValue() -> h
-    boolean isSingleValue() -> i
-    boolean isUnknown() -> j
+    com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue() -> a
+    com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> b
+    com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue() -> c
+    com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> d
+    boolean isNonTrivial() -> e
+    boolean isSingleEnumValue() -> f
+    boolean isSingleFieldValue() -> g
+    boolean isSingleNumberValue() -> h
+    boolean isSingleStringValue() -> i
+    boolean isSingleValue() -> j
+    boolean isUnknown() -> k
 com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.t.a.q.b:
     java.util.concurrent.ConcurrentHashMap singleStringValues -> d
     java.util.concurrent.ConcurrentHashMap singleNumberValues -> c
@@ -21828,32 +21852,33 @@
     1:1:com.android.tools.r8.ir.analysis.value.SingleFieldValue createSingleFieldValue(com.android.tools.r8.graph.DexField):25:25 -> b
 com.android.tools.r8.ir.analysis.value.SingleEnumValue -> com.android.tools.r8.t.a.q.c:
     1:1:void <init>(com.android.tools.r8.graph.DexField):13:13 -> <init>
-    boolean isSingleEnumValue() -> e
+    boolean isSingleEnumValue() -> f
     1:1:java.lang.String toString():28:28 -> toString
 com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.t.a.q.d:
     com.android.tools.r8.graph.DexField field -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexField):27:28 -> <init>
+    com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue() -> a
     1:4:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):63:66 -> a
     5:6:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):71:72 -> a
-    boolean isSingleFieldValue() -> f
+    boolean isSingleFieldValue() -> g
     1:1:int hashCode():52:52 -> hashCode
-    1:1:com.android.tools.r8.graph.DexField getField():32:32 -> k
+    1:1:com.android.tools.r8.graph.DexField getField():32:32 -> l
     1:1:java.lang.String toString():57:57 -> toString
 com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.t.a.q.e:
     long value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(long):23:24 -> <init>
-    com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> a
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
-    1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):64:69 -> a
-    7:9:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):68:70 -> a
-    boolean isSingleNumberValue() -> g
-    1:1:int hashCode():53:53 -> hashCode
-    1:2:boolean getBooleanValue():38:39 -> k
-    1:1:java.lang.String toString():58:58 -> toString
+    1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):69:74 -> a
+    7:9:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):73:75 -> a
+    com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> b
+    boolean isSingleNumberValue() -> h
+    1:1:int hashCode():58:58 -> hashCode
+    1:2:boolean getBooleanValue():43:44 -> l
+    1:1:java.lang.String toString():63:63 -> toString
 com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.t.a.q.f:
     com.android.tools.r8.graph.DexString string -> a
     boolean $assertionsDisabled -> b
@@ -21863,26 +21888,26 @@
     1:7:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):66:72 -> a
     8:11:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):70:73 -> a
     12:22:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):69:79 -> a
-    com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue() -> b
-    boolean isSingleStringValue() -> h
+    com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue() -> c
     1:1:int hashCode():53:53 -> hashCode
-    1:1:com.android.tools.r8.graph.DexString getDexString():43:43 -> k
+    boolean isSingleStringValue() -> i
+    1:1:com.android.tools.r8.graph.DexString getDexString():43:43 -> l
     1:1:java.lang.String toString():58:58 -> toString
 com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.t.a.q.g:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
-    com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> c
-    boolean isNonTrivial() -> d
-    boolean isSingleValue() -> i
+    com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> d
+    boolean isNonTrivial() -> e
+    boolean isSingleValue() -> j
 com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.t.a.q.h:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
-    boolean isNonTrivial() -> d
+    boolean isNonTrivial() -> e
     1:1:int hashCode():34:34 -> hashCode
-    boolean isUnknown() -> j
-    1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():14:14 -> k
+    boolean isUnknown() -> k
+    1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():14:14 -> l
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.t.b.a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     int opcode() -> C2
@@ -22030,7 +22055,7 @@
     int maxInValueRegister() -> A2
     int maxOutValueRegister() -> B2
     int opcode() -> C2
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():264:264 -> E0
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():265:265 -> E0
     boolean throwsOnNullInput() -> F2
     1:1:com.android.tools.r8.ir.code.Value array():57:57 -> G2
     1:1:com.android.tools.r8.ir.code.Value index():61:61 -> H2
@@ -22062,42 +22087,40 @@
     109:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):197:198 -> a
     111:111:com.android.tools.r8.ir.code.MemberType getMemberType():66:66 -> a
     111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):200 -> a
-    112:151:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):200:239 -> a
-    152:153:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):235:236 -> a
-    154:154:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):235:235 -> a
-    155:155:com.android.tools.r8.ir.code.Value dest():53:53 -> a
-    155:155:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):237 -> a
-    156:156:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):237:237 -> a
-    157:158:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):231:232 -> a
-    159:159:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):231:231 -> a
-    160:160:com.android.tools.r8.ir.code.Value dest():53:53 -> a
-    160:160:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):233 -> a
-    161:161:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):233:233 -> a
-    162:183:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):207:228 -> a
-    184:186:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):227:229 -> a
-    187:188:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):223:224 -> a
-    189:191:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):223:225 -> a
-    192:193:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):219:220 -> a
-    194:196:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):219:221 -> a
-    197:198:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):215:216 -> a
-    199:201:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):215:217 -> a
-    202:202:com.android.tools.r8.ir.code.MemberType getMemberType():66:66 -> a
-    202:202:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239 -> a
-    203:203:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:239 -> a
-    204:208:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):244:248 -> a
-    209:209:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    209:209:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):248 -> a
-    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    210:210:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):248 -> a
-    211:211:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):248:248 -> a
-    212:212:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):254:254 -> a
-    213:214:boolean outTypeKnownToBeBoolean(java.util.Set):269:270 -> a
-    215:215:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):276:276 -> a
-    216:216:com.android.tools.r8.ir.code.Value dest():53:53 -> a
-    216:216:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):276 -> a
-    217:217:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):276:276 -> a
-    218:218:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
+    112:152:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):200:240 -> a
+    153:155:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):236:236 -> a
+    156:156:com.android.tools.r8.ir.code.Value dest():53:53 -> a
+    156:156:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):238 -> a
+    157:157:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):238:238 -> a
+    158:160:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):232:232 -> a
+    161:161:com.android.tools.r8.ir.code.Value dest():53:53 -> a
+    161:161:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):234 -> a
+    162:162:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):234:234 -> a
+    163:184:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):208:229 -> a
+    185:187:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):228:230 -> a
+    188:190:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):224:224 -> a
+    192:192:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):226:226 -> a
+    193:195:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):220:220 -> a
+    197:197:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):222:222 -> a
+    198:200:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):216:216 -> a
+    202:202:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):218:218 -> a
+    203:203:com.android.tools.r8.ir.code.MemberType getMemberType():66:66 -> a
+    203:203:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):240 -> a
+    204:204:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):240:240 -> a
+    205:209:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):245:249 -> a
+    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    210:210:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):249 -> a
+    211:211:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    211:211:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    211:211:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):249 -> a
+    212:212:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):249:249 -> a
+    213:213:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):255:255 -> a
+    214:216:boolean outTypeKnownToBeBoolean(java.util.Set):270:272 -> a
+    217:217:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):277:277 -> a
+    218:218:com.android.tools.r8.ir.code.Value dest():53:53 -> a
+    218:218:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):277 -> a
+    219:219:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):277:277 -> a
+    220:220:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):277:277 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):132:132 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():66:66 -> e
@@ -22206,16 +22229,15 @@
     43:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():293:293 -> a
     43:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):239 -> a
     boolean isAssume() -> a1
-    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:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):229:233 -> b
-    7:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):276:279 -> b
-    11:11:boolean isAssumeNone():124:124 -> b
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):229:233 -> b
+    6:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):276:279 -> b
+    10:10:boolean isAssumeNone():124:124 -> b
+    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
+    11:11:boolean isAssumeDynamicType():137:137 -> b
     11:11:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
-    12:12:boolean isAssumeDynamicType():137:137 -> b
-    12:12:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
-    13:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):285:288 -> b
-    17:19:boolean verifyTypes(com.android.tools.r8.graph.AppView):287:289 -> b
-    20:22:boolean verifyTypes(com.android.tools.r8.graph.AppView):281:283 -> b
+    12:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):285:288 -> b
+    16:18:boolean verifyTypes(com.android.tools.r8.graph.AppView):287:289 -> b
+    19:21:boolean verifyTypes(com.android.tools.r8.graph.AppView):281:283 -> b
     1:1:boolean isAssumeDynamicType():137:137 -> b1
     1:1:boolean isAssumeDynamicType():137:137 -> c
     1:1:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):70 -> c
@@ -22264,17 +22286,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():371:371 -> e
     1:5:boolean equals(java.lang.Object):394:398 -> equals
     1:1:int hashCode():404:404 -> hashCode
-com.android.tools.r8.ir.code.Assume$NoAssumption -> com.android.tools.r8.t.b.l$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>
-    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
-    boolean isAssumeNonNull() -> b
-    boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.code.Assume$NoAssumption get():344:344 -> d
-com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.t.b.l$e:
+com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.t.b.l$d:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():408:410 -> <clinit>
@@ -22318,41 +22330,42 @@
     1:124:void <init>():54:177 -> <init>
     1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():229:230 -> A
     1:2:boolean hasCatchHandlers():543:544 -> B
-    1:1:boolean hasIncompletePhis():1132:1132 -> C
-    1:1:boolean hasOneNormalExit():1518:1518 -> D
+    1:1:boolean hasIncompletePhis():1136:1136 -> C
+    1:1:boolean hasOneNormalExit():1522:1522 -> D
     1:1:boolean hasPhis():527:527 -> E
     1:1:boolean hasUniquePredecessor():225:225 -> F
-    1:2:void incrementUnfilledPredecessorCount():667:668 -> G
+    1:2:void incrementUnfilledPredecessorCount():671:672 -> G
     1:1:boolean isEmpty():612:612 -> H
     1:1:boolean isFilled():535:535 -> I
-    1:1:boolean isSealed():1120:1120 -> J
-    1:11:boolean isSimpleAlwaysThrowingPath():1495:1505 -> K
-    1:1:boolean isTrivialGoto():1450:1450 -> L
-    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1594:1594 -> M
-    1:2:boolean notifyPredecessorsMayChangeListeners():243:244 -> N
-    1:2:boolean notifySuccessorsMayChangeListeners():197:198 -> O
-    1:1:int numberOfCatchHandlers():1543:1543 -> P
-    1:2:int numberOfThrowingInstructions():1548:1549 -> Q
-    1:2:void removeAllNormalSuccessors():290:291 -> R
-    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> R
-    3:3:void removeAllNormalSuccessors():291 -> R
-    4:12:void removeAllNormalSuccessors():292:300 -> R
-    1:1:void setFilledForTesting():539:539 -> S
-    1:9:java.lang.String toDetailedString():1173:1181 -> T
-    10:10:boolean isFilled():535:535 -> T
-    10:10:java.lang.String toDetailedString():1181 -> T
-    11:12:java.lang.String toDetailedString():1181:1182 -> T
-    13:13:boolean isSealed():1120:1120 -> T
-    13:13:java.lang.String toDetailedString():1182 -> T
-    14:51:java.lang.String toDetailedString():1182:1219 -> T
-    52:52:int digits(int):1169:1169 -> T
-    52:52:java.lang.String toDetailedString():1219 -> T
-    53:88:java.lang.String toDetailedString():1219:1254 -> T
-    1:3:void unlinkCatchHandler():781:783 -> U
-    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():742:746 -> V
-    1:5:void unlinkSinglePredecessorSiblingsAllowed():752:756 -> W
-    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():765:770 -> X
-    1:2:boolean verifyFilledPredecessors():682:683 -> Y
+    1:1:boolean isReturnBlock():616:616 -> J
+    1:1:boolean isSealed():1124:1124 -> K
+    1:11:boolean isSimpleAlwaysThrowingPath():1499:1509 -> L
+    1:1:boolean isTrivialGoto():1454:1454 -> M
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1598:1598 -> N
+    1:2:boolean notifyPredecessorsMayChangeListeners():243:244 -> O
+    1:2:boolean notifySuccessorsMayChangeListeners():197:198 -> P
+    1:1:int numberOfCatchHandlers():1547:1547 -> Q
+    1:2:int numberOfThrowingInstructions():1552:1553 -> R
+    1:2:void removeAllNormalSuccessors():290:291 -> S
+    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> S
+    3:3:void removeAllNormalSuccessors():291 -> S
+    4:12:void removeAllNormalSuccessors():292:300 -> S
+    1:1:void setFilledForTesting():539:539 -> T
+    1:9:java.lang.String toDetailedString():1177:1185 -> U
+    10:10:boolean isFilled():535:535 -> U
+    10:10:java.lang.String toDetailedString():1185 -> U
+    11:12:java.lang.String toDetailedString():1185:1186 -> U
+    13:13:boolean isSealed():1124:1124 -> U
+    13:13:java.lang.String toDetailedString():1186 -> U
+    14:51:java.lang.String toDetailedString():1186:1223 -> U
+    52:52:int digits(int):1173:1173 -> U
+    52:52:java.lang.String toDetailedString():1223 -> U
+    53:88:java.lang.String toDetailedString():1223:1258 -> U
+    1:3:void unlinkCatchHandler():785:787 -> V
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():746:750 -> W
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():756:760 -> X
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():769:774 -> Y
+    1:2:boolean verifyFilledPredecessors():686:687 -> Z
     1:1:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):85:85 -> a
     2:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):85:85 -> a
     3:3:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):90:90 -> a
@@ -22371,98 +22384,98 @@
     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
+    105:106:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):647:648 -> a
+    107:109:void clearMark(int):660:662 -> a
+    110:110:void addPhi(com.android.tools.r8.ir.code.Phi):692:692 -> a
+    111:111:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):706:706 -> 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
+    112:112:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):706 -> a
+    113:116:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):706:709 -> a
+    117:117:void close(com.android.tools.r8.ir.conversion.IRBuilder):713:713 -> 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
+    118:118:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
+    119:123:void close(com.android.tools.r8.ir.conversion.IRBuilder):713:717 -> 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:boolean blocksClean(java.util.List):728:728 -> a
-    149:158:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):808:817 -> 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
+    124:124:void close(com.android.tools.r8.ir.conversion.IRBuilder):717 -> a
+    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):718:718 -> a
+    126:127:boolean verifyNoValuesAfterThrowingInstruction():1584:1585 -> a
+    126:127:void close(com.android.tools.r8.ir.conversion.IRBuilder):718 -> a
+    128:128:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1602:1602 -> a
+    128:128:boolean verifyNoValuesAfterThrowingInstruction():1585 -> a
+    128:128:void close(com.android.tools.r8.ir.conversion.IRBuilder):718 -> a
+    129:134:boolean verifyNoValuesAfterThrowingInstruction():1586:1591 -> a
+    129:134:void close(com.android.tools.r8.ir.conversion.IRBuilder):718 -> a
+    135:135:void close(com.android.tools.r8.ir.conversion.IRBuilder):719:719 -> a
+    136:147:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1083:1094 -> a
+    136:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):720 -> a
+    148:148:boolean blocksClean(java.util.List):732:732 -> a
+    149:158:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):812:821 -> a
+    159:159:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):818:818 -> a
+    160:169:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):847:856 -> a
+    170:179:void linkCatchSuccessors(java.util.List,java.util.List):895:904 -> a
+    180:192:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):908:920 -> 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:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1013 -> 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:256:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
-    257:264:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
-    265:268:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
-    269:301:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
-    302:303:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
-    304:305: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
-    306:310: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
-    311:317: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
-    318:327: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
-    328:328:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    328:328: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
-    329:329:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    329:329: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
-    330:331:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1444:1445 -> a
-    332:333:boolean canThrow():1557:1558 -> a
-    334:334:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
-    335:335:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
-    335:335:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
-    336:336:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
-    337:337:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
-    338:338: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
-    339:350:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1654 -> a
-    351:356:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
-    351:356:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
-    357:361:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
-    362:378: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
-    379:409:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1756 -> a
-    379:409: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
-    410:410:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    410:410:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
-    410:410: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
-    411:414:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
-    411:414: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
-    415:415:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    415:415:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
-    415:415: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
-    416:421:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
-    416: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):1707 -> a
-    422:422:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
-    422:422: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
+    193:196:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):921 -> a
+    197:210:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):926:939 -> a
+    211:221:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):950:960 -> a
+    222:223:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1010:1011 -> a
+    222:223:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1017 -> a
+    224:242:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1048:1066 -> a
+    243:247:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1073:1077 -> a
+    248:251:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1076:1079 -> a
+    252:256:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1128:1132 -> a
+    257:264:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1145:1152 -> a
+    265:268:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1262:1265 -> a
+    269:301:void print(com.android.tools.r8.utils.CfgPrinter):1270:1302 -> a
+    302:303:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1306:1307 -> a
+    304:305: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):1365:1366 -> a
+    306:310:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1379:1383 -> a
+    311:317: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[]):1414:1420 -> a
+    318:327: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):1436:1445 -> a
+    328:328:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):702:702 -> a
+    328:328: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):1446 -> a
+    329:329:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):702:702 -> a
+    329:329: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):1447 -> a
+    330:331:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1448:1449 -> a
+    332:333:boolean canThrow():1561:1562 -> a
+    334:334:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1610:1610 -> a
+    335:335:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1614:1614 -> a
+    335:335:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1610 -> a
+    336:336:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1614:1614 -> a
+    337:337:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1618:1618 -> a
+    338:338:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1629:1629 -> a
+    339:350:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1647:1658 -> a
+    351:356:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1679:1684 -> a
+    351:356:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662 -> a
+    357:361:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1666:1670 -> a
+    362:378: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):1695:1711 -> a
+    379:409:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1730:1760 -> a
+    379:409: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):1711 -> a
+    410:410:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):702:702 -> a
+    410:410:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1761 -> a
+    410:410: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):1711 -> a
+    411:414:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762:1765 -> a
+    411:414: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):1711 -> a
+    415:415:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):702:702 -> a
+    415:415:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1766 -> a
+    415:415: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):1711 -> a
+    416:421:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1767:1772 -> a
+    416: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):1711 -> a
+    422:422:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1750:1750 -> a
+    422:422: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):1711 -> a
     423:423:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    423:423:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
-    423:423: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
-    424:458:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
-    424: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
+    423:423:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1750 -> a
+    423:423: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):1711 -> a
+    424:458:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1750:1784 -> a
+    424: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):1711 -> a
     459:459:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):136:136 -> a
-    459:459:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
-    459: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:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> 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:461:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
-    461:461: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
-    462:536:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1800:1874 -> a
+    459:459:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1786 -> a
+    459: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):1711 -> a
+    460:460:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1787:1787 -> 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):1711 -> a
+    461:461:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1730:1730 -> a
+    461:461: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):1711 -> a
+    462:536:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1804:1878 -> 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():95:95 -> b
@@ -22475,74 +22488,74 @@
     40:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
     45:97:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371:423 -> b
     98:98:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):578:578 -> b
-    99:100:void decrementUnfilledPredecessorCount(int):672:673 -> b
-    101:102:void removePhi(com.android.tools.r8.ir.code.Phi):692:693 -> b
-    103:103:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> b
-    104:108:boolean isCatchHandlerForSingleGuard():822:826 -> b
-    104:108:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> b
-    109:113:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> b
-    114:141:java.util.Set cleanForRemoval():857:884 -> b
-    142:143:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> b
-    142:143:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> b
-    144:146:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> b
-    147:148:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> b
-    149:161:void removeInstructions(java.util.List):1324:1336 -> b
-    162:162:void setInstructions(java.util.LinkedList):1316:1316 -> b
-    162:162:void removeInstructions(java.util.List):1337 -> b
+    99:100:void decrementUnfilledPredecessorCount(int):676:677 -> b
+    101:102:void removePhi(com.android.tools.r8.ir.code.Phi):696:697 -> b
+    103:103:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):800:800 -> b
+    104:108:boolean isCatchHandlerForSingleGuard():826:830 -> b
+    104:108:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):801 -> b
+    109:113:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):803:807 -> b
+    114:141:java.util.Set cleanForRemoval():861:888 -> b
+    142:143:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1010:1011 -> b
+    142:143:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1023 -> b
+    144:146:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1025:1027 -> b
+    147:148:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1099:1100 -> b
+    149:161:void removeInstructions(java.util.List):1328:1340 -> b
+    162:162:void setInstructions(java.util.LinkedList):1320:1320 -> b
+    162:162:void removeInstructions(java.util.List):1341 -> b
     1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):198:198 -> c
     2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):305:309 -> c
     7:8:void removePhisByIndex(java.util.List):521:522 -> c
-    9:10:boolean isMarked(int):662:663 -> c
-    11:14:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1100:1103 -> c
-    15:15:void clearCatchHandlers():1534:1534 -> c
-    16:16:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> c
-    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):730:731 -> d
-    3:5:void clearCurrentDefinitions():992:994 -> d
-    6:6:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> d
-    7:7:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> d
+    9:10:boolean isMarked(int):666:667 -> c
+    11:14:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1104:1107 -> c
+    15:15:void clearCatchHandlers():1538:1538 -> c
+    16:16:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1606:1606 -> c
+    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):734:735 -> d
+    3:5:void clearCurrentDefinitions():996:998 -> d
+    6:6:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1602:1602 -> d
+    7:7:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1606:1606 -> d
     7:7:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):574 -> d
     java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock) -> e
     1:1:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):579:579 -> e
-    2:3:void clearUserInfo():638:639 -> e
-    4:7:void mark(int):649:652 -> e
+    2:3:void clearUserInfo():642:643 -> e
+    4:7:void mark(int):653:656 -> e
     1:2:int numberInstructions(int):562:563 -> f
-    3:6:void link(com.android.tools.r8.ir.code.BasicBlock):721:724 -> f
-    7:8:boolean consistentCatchHandlers():963:964 -> f
-    9:9:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1530:1530 -> f
-    9:9:boolean consistentCatchHandlers():965 -> f
-    10:11:boolean consistentCatchHandlers():967:968 -> f
-    12:31:boolean consistentCatchHandlers():967:986 -> f
-    32:34:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1345:1347 -> f
+    3:6:void link(com.android.tools.r8.ir.code.BasicBlock):725:728 -> f
+    7:8:boolean consistentCatchHandlers():967:968 -> f
+    9:9:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1534:1534 -> f
+    9:9:boolean consistentCatchHandlers():969 -> f
+    10:12:boolean consistentCatchHandlers():971:971 -> f
+    15:31:boolean consistentCatchHandlers():974:990 -> f
+    32:34:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1349:1351 -> f
     int onThrowValueRegister(int) -> g
-    1:2:void decrementUnfilledPredecessorCount():677:678 -> g
-    3:4:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1162:1163 -> g
-    5:13:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1107:1115 -> g
-    5:13:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1163 -> g
-    14:14:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1163:1163 -> g
+    1:2:void decrementUnfilledPredecessorCount():681:682 -> g
+    3:4:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1166:1167 -> g
+    5:13:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1111:1119 -> g
+    5:13:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1167 -> g
+    14:14:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1167:1167 -> g
     1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):260:262 -> h
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> h
     4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):262 -> h
     5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):262:262 -> h
     6:7:void setNumber(int):553:554 -> h
-    8:22:void deduplicatePhis():1927:1941 -> h
-    1:4:void detachAllSuccessors():835:838 -> i
-    5:6:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1538:1539 -> i
-    7:8:boolean verifyOnThrowWrite(int):1570:1571 -> i
-    1:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1478:1480 -> j
-    1:1:com.android.tools.r8.ir.code.Instruction entry():616:616 -> k
-    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():626:627 -> l
-    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> l
-    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():627 -> l
-    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():628:630 -> l
-    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():620:622 -> m
-    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1522:1526 -> n
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1530:1530 -> o
+    8:22:void deduplicatePhis():1931:1945 -> h
+    1:4:void detachAllSuccessors():839:842 -> i
+    5:6:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1542:1543 -> i
+    7:8:boolean verifyOnThrowWrite(int):1574:1575 -> i
+    1:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1482:1484 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():620:620 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():630:631 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1602:1602 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():631 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():632:634 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():624:626 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1526:1530 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1534:1534 -> o
     1:1:java.util.LinkedList getInstructions():570:570 -> p
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():94:94 -> q
     1:2:java.util.List getMutablePredecessors():238:239 -> r
     1:2:java.util.List getMutableSuccessors():192:193 -> s
     1:7:java.util.List getNormalPredecessors():250:256 -> t
-    1:1:java.lang.String toString():1154:1154 -> toString
+    1:1:java.lang.String toString():1158:1158 -> toString
     1:11:java.util.List getNormalSuccessors():204:214 -> u
     1:2:int getNumber():548:549 -> v
     1:1:java.lang.String getNumberAsString():558:558 -> w
@@ -22570,21 +22583,21 @@
     1:1:void <init>(java.lang.String,int):112:112 -> <init>
 com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.t.b.n$d:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1904:1904 -> <clinit>
-    1:1:void <init>():1904:1904 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1904:1904 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1904:1904 -> doEquivalent
-    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1907:1909 -> doEquivalent
-    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1904 -> doEquivalent
-    1:1:int doHash(java.lang.Object):1904:1904 -> doHash
-    2:3:int doHash(com.android.tools.r8.ir.code.Phi):1919:1920 -> doHash
-    2:3:int doHash(java.lang.Object):1904 -> doHash
+    1:1:void <clinit>():1908:1908 -> <clinit>
+    1:1:void <init>():1908:1908 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1908:1908 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1908:1908 -> doEquivalent
+    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1911:1913 -> doEquivalent
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1908 -> doEquivalent
+    1:1:int doHash(java.lang.Object):1908:1908 -> doHash
+    2:3:int doHash(com.android.tools.r8.ir.code.Phi):1923:1924 -> doHash
+    2:3:int doHash(java.lang.Object):1908 -> doHash
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.t.b.n$e:
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo CAN_THROW -> b
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo NO_THROW -> a
     1:2:void <clinit>():104:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):103:103 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108:108 -> a
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.t.b.o:
@@ -22648,7 +22661,7 @@
     118:118:boolean hasNext():58:58 -> a
     118:118:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):343 -> a
     119:122:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):343:346 -> a
-    123:123:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    123:123:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> a
     123:123:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):346 -> a
     124:124:boolean hasPrevious():74:74 -> a
     124:124:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):350 -> a
@@ -22670,7 +22683,7 @@
     235: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):540 -> a
     236:239:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.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:543 -> a
     240: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):542:544 -> a
-    243:243:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    243:243:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> 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):545 -> a
     244: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):545:577 -> a
     277:277:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():95:95 -> a
@@ -22688,7 +22701,7 @@
     315:315:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
     315:315:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):614 -> a
     316:349:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):613:646 -> a
-    350:350:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):983:983 -> a
+    350:350:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):987:987 -> a
     350:350:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):646 -> a
     351:364:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):649:662 -> a
     365:381: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):462:478 -> a
@@ -22698,16 +22711,16 @@
     388:388:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):675 -> a
     389:399:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):675:685 -> a
     400:404:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):684:688 -> a
-    405:431:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):694:720 -> a
-    432:432:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):136:136 -> a
-    432:432:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):725 -> a
-    433:433:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):726:726 -> a
-    434:434:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    434:434:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):726 -> a
-    435:452:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):726:743 -> a
-    453:453:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
-    453:453:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):218 -> a
-    454:456:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):220:222 -> a
+    405:433:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):694:722 -> a
+    434:434:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):136:136 -> a
+    434:434:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):725 -> a
+    435:435:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):726:726 -> a
+    436:436:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    436:436:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):726 -> a
+    437:454:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):726:743 -> a
+    455:455:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> a
+    455:455:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):218 -> a
+    456:458:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):220:222 -> a
     1:1:void add(java.lang.Object):29:29 -> add
     1:7:void add(com.android.tools.r8.ir.code.Instruction):103:109 -> b
     1:1:com.android.tools.r8.ir.code.Instruction next():63:63 -> c
@@ -22769,7 +22782,7 @@
     1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> K2
     boolean hasInvariantOutType() -> L0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1318:1318 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1333:1333 -> 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():90:90 -> a
@@ -23039,8 +23052,8 @@
     1:1:com.android.tools.r8.ir.code.Value dest():70:70 -> G2
     1:2:double getDoubleValue():94:95 -> H2
     1:2:float getFloatValue():89:90 -> I2
-    1:2:int getIntValue():78:79 -> J2
-    3:5:int getIntValue():78:80 -> J2
+    1:3:int getIntValue():78:78 -> J2
+    5:5:int getIntValue():80:80 -> J2
     1:2:long getLongValue():84:85 -> K2
     1:1:long getRawValue():99:99 -> L2
     1:1:boolean is16Bit():280:280 -> M2
@@ -23119,7 +23132,7 @@
     10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71 -> a
     11:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:72 -> a
     13:13:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137:137 -> a
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137 -> a
     15:15:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137:137 -> a
     16:16:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):142:142 -> a
@@ -23137,8 +23150,7 @@
     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
+    15:17:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
     18:18:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
     18:18: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
@@ -23457,7 +23469,15 @@
     27:28:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):209:210 -> a
     29:29:com.android.tools.r8.graph.DexField getField():48:48 -> a
     29:29:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):210 -> a
-    30:34:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):210:214 -> a
+    30:32:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):210:212 -> a
+    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    33:33:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):212 -> a
+    34:34:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):213:213 -> a
+    35:35:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    35:35:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):213 -> a
+    36:36:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():134:134 -> a
+    36:36:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):213 -> a
+    37:41:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):214:218 -> a
     1:7:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):64:70 -> b
     8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
     8:8:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):73 -> b
@@ -23537,7 +23557,7 @@
     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():1184:1184 -> A
+    34:34:boolean noColorsInUse():1188:1188 -> A
     34:34:void traceBlocks():431 -> A
     35:35:void traceBlocks():431:431 -> A
     1:12:boolean verifyNoImpreciseOrBottomTypes():886:897 -> B
@@ -23556,48 +23576,47 @@
     40:46:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):888:894 -> a
     47:47:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):893:893 -> a
     48:51:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):930:933 -> a
-    52:52:java.lang.Iterable instructions(java.util.function.Predicate):957:957 -> a
-    53:65:java.util.List collectArguments(boolean):1013:1025 -> a
-    53:65:java.util.List collectArguments():1009 -> a
-    66:66:java.util.List collectArguments(boolean):1024:1024 -> a
-    66:66:java.util.List collectArguments():1009 -> 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):1041:1041 -> a
-    68:69:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1063:1064 -> a
-    70:70:void setAllThrowingInstructionsHavePositions(boolean):1101:1101 -> a
-    71:74:boolean removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1131:1134 -> a
-    75:75:boolean isMarkingColorInUse(int):1171:1171 -> a
-    76:76:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1188:1188 -> a
-    77:85:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1213:1221 -> a
-    77:85:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1189 -> a
-    86:91:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1190:1195 -> a
+    52:52:java.lang.Iterable blocks(java.util.function.Predicate):953:953 -> a
+    53:65:java.util.List collectArguments(boolean):1017:1029 -> a
+    53:65:java.util.List collectArguments():1013 -> a
+    66:66:java.util.List collectArguments(boolean):1028:1028 -> a
+    66:66:java.util.List collectArguments():1013 -> 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):1045:1045 -> a
+    68:69:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1067:1068 -> a
+    70:70:void setAllThrowingInstructionsHavePositions(boolean):1105:1105 -> a
+    71:74:boolean removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1135:1138 -> a
+    75:75:boolean isMarkingColorInUse(int):1175:1175 -> a
+    76:76:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1192:1192 -> a
+    77:85:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1217:1225 -> a
+    77:85:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1193 -> a
+    86:91:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1194:1199 -> 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):1195 -> a
-    93:99:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1196:1202 -> a
+    92:92:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1199 -> a
+    93:99:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1200:1206 -> 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):1202 -> a
-    101:101:void markTransitiveSuccessors(java.util.Deque,int):1260:1260 -> a
-    102:102:boolean isMarkingColorInUse(int):1171:1171 -> a
-    102:102:void markTransitiveSuccessors(java.util.Deque,int):1260 -> a
-    103:104:boolean anyBlocksMarkedWithColor(int):1175:1176 -> a
-    103:104:void markTransitiveSuccessors(java.util.Deque,int):1260 -> a
-    105:114:void markTransitiveSuccessors(java.util.Deque,int):1260:1269 -> a
-    115:115:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1281:1281 -> a
-    116:116:boolean isMarkingColorInUse(int):1171:1171 -> a
-    116:116:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1281 -> a
-    117:128:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1281:1292 -> a
-    129:150:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1303:1324 -> a
-    151:151: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
-    151:151:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1200 -> a
+    100:100:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1206 -> a
+    101:101:void markTransitiveSuccessors(java.util.Deque,int):1264:1264 -> a
+    102:102:boolean isMarkingColorInUse(int):1175:1175 -> a
+    102:102:void markTransitiveSuccessors(java.util.Deque,int):1264 -> a
+    103:104:boolean anyBlocksMarkedWithColor(int):1179:1180 -> a
+    103:104:void markTransitiveSuccessors(java.util.Deque,int):1264 -> a
+    105:114:void markTransitiveSuccessors(java.util.Deque,int):1264:1273 -> a
+    115:115:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1285:1285 -> a
+    116:116:boolean isMarkingColorInUse(int):1175:1175 -> a
+    116:116:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1285 -> a
+    117:128:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1285:1296 -> a
+    129:150:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1307:1328 -> a
+    151:151:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1606:1606 -> a
+    151:151:java.util.Iterator lambda$getInstructionsReachableFrom$11(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1204 -> a
     1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):589:590 -> b
     3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):598:601 -> b
     3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):590 -> b
     7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):591:593 -> b
-    10:12:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):903:905 -> b
-    13:13:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):903:903 -> b
+    10:13:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):903:903 -> b
     14:14:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):915:915 -> b
-    15:15:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):957:957 -> b
-    16:16:java.util.ListIterator listIterator(int):983:983 -> b
-    17:22:boolean computeAllThrowingInstructionsHavePositions():1105:1110 -> b
+    15:15:java.lang.Iterable instructions(java.util.function.Predicate):961:961 -> b
+    16:16:java.util.ListIterator listIterator(int):987:987 -> b
+    17:22:boolean computeAllThrowingInstructionsHavePositions():1109:1114 -> b
     1:53:java.util.Map computeLiveAtEntrySets():149:201 -> c
     54:74:java.util.Map computeLiveAtEntrySets():200:220 -> c
     75:75:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():95:95 -> c
@@ -23606,37 +23625,39 @@
     112:112:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():83:83 -> c
     112:112:java.util.Map computeLiveAtEntrySets():259 -> c
     113:115:java.util.Map computeLiveAtEntrySets():259:261 -> c
-    116:121:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):914:919 -> c
-    122:128:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):914:920 -> c
+    116:122:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):914:914 -> c
+    128:128:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):920:920 -> c
     129:129:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):918:918 -> c
-    130:137:boolean verifySSATypeLattice(java.util.function.Predicate):939:946 -> c
-    138:138:void returnMarkingColor(int):1165:1165 -> c
-    139:139:boolean isMarkingColorInUse(int):1171:1171 -> c
-    139:139:void returnMarkingColor(int):1165 -> c
-    140:140:void returnMarkingColor(int):1165:1165 -> c
-    141:142:void clearMarks(int):456:457 -> c
-    141:142:void returnMarkingColor(int):1166 -> c
-    143:143:void returnMarkingColor(int):1167:1167 -> c
-    1:1:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):927:927 -> d
-    2:8:java.util.List computeNormalExitBlocks():969:975 -> d
+    130:130:java.util.Iterator lambda$blocks$9(java.util.function.Predicate):953:953 -> c
+    131:131:void returnMarkingColor(int):1169:1169 -> c
+    132:132:boolean isMarkingColorInUse(int):1175:1175 -> c
+    132:132:void returnMarkingColor(int):1169 -> c
+    133:133:void returnMarkingColor(int):1169:1169 -> c
+    134:135:void clearMarks(int):456:457 -> c
+    134:135:void returnMarkingColor(int):1170 -> c
+    136:136:void returnMarkingColor(int):1171:1171 -> c
+    1:1:java.util.Iterator lambda$instructions$10(java.util.function.Predicate):961:961 -> d
+    2:8:java.util.List computeNormalExitBlocks():973:979 -> d
     1:4:boolean consistentBlockNumbering():743:746 -> e
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1087:1087 -> f
-    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> f
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1087 -> f
-    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1088:1088 -> f
-    1:1:boolean doAllThrowingInstructionsHavePositions():1097:1097 -> g
+    5:12:boolean verifySSATypeLattice(java.util.function.Predicate):939:946 -> e
+    1:1:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):927:927 -> f
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1091:1091 -> f
+    3:3:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> f
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1091 -> f
+    4:4:com.android.tools.r8.ir.code.ConstNumber createConstNull():1092:1092 -> f
+    1:1:boolean doAllThrowingInstructionsHavePositions():1101:1101 -> g
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():142:142 -> h
-    1:1:int getHighestBlockNumber():1077:1077 -> i
-    1:1:int getNextInstructionNumber():1005:1005 -> j
-    1:7:com.android.tools.r8.ir.code.Value getThis():1030:1036 -> k
-    1:3:java.util.Set getUnreachableBlocks():1226:1228 -> l
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1256:1256 -> l
-    4:4:java.util.Set getUnreachableBlocks():1228 -> l
-    5:10:java.util.Set getUnreachableBlocks():1229:1234 -> l
-    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():961:961 -> m
-    1:1:java.lang.Iterable instructions():953:953 -> n
+    1:1:int getHighestBlockNumber():1081:1081 -> i
+    1:1:int getNextInstructionNumber():1009:1009 -> j
+    1:7:com.android.tools.r8.ir.code.Value getThis():1034:1040 -> k
+    1:3:java.util.Set getUnreachableBlocks():1230:1232 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1260:1260 -> l
+    4:4:java.util.Set getUnreachableBlocks():1232 -> l
+    5:10:java.util.Set getUnreachableBlocks():1233:1238 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():965:965 -> m
+    1:1:java.lang.Iterable instructions():957:957 -> n
     1:1:boolean isConsistentGraph():576:576 -> o
-    2:2:boolean noColorsInUse():1184:1184 -> o
+    2:2:boolean noColorsInUse():1188:1188 -> o
     2:2:boolean isConsistentGraph():576 -> o
     3:5:boolean isConsistentGraph():576:578 -> o
     6:21:boolean consistentPredecessorSuccessors():714:729 -> o
@@ -23699,10 +23720,10 @@
     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():979:979 -> q
+    1:1:java.util.ListIterator listIterator():983:983 -> 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():987:989 -> s
-    1:7:int numberRemainingInstructions():995:1001 -> t
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():991:993 -> s
+    1:7:int numberRemainingInstructions():999:1005 -> 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
@@ -23711,17 +23732,17 @@
     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:boolean removeAllTrivialPhis():1118:1118 -> v
-    1:3:java.util.Set removeUnreachableBlocks():1239:1241 -> w
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1256:1256 -> w
-    4:4:java.util.Set removeUnreachableBlocks():1241 -> w
-    5:14:java.util.Set removeUnreachableBlocks():1242:1251 -> w
-    1:1:int reserveMarkingColor():1141:1141 -> x
-    2:2:boolean anyMarkingColorAvailable():1155:1155 -> x
-    2:2:int reserveMarkingColor():1141 -> x
-    3:11:int reserveMarkingColor():1141:1149 -> x
+    1:1:boolean removeAllTrivialPhis():1122:1122 -> v
+    1:3:java.util.Set removeUnreachableBlocks():1243:1245 -> w
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1260:1260 -> w
+    4:4:java.util.Set removeUnreachableBlocks():1245 -> w
+    5:14:java.util.Set removeUnreachableBlocks():1246:1255 -> w
+    1:1:int reserveMarkingColor():1145:1145 -> x
+    2:2:boolean anyMarkingColorAvailable():1159:1159 -> x
+    2:2:int reserveMarkingColor():1145 -> x
+    3:11:int reserveMarkingColor():1145:1153 -> x
     12:13:boolean verifyNoBlocksMarked(int):472:473 -> x
-    12:13:int reserveMarkingColor():1149 -> x
+    12:13:int reserveMarkingColor():1153 -> 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
@@ -23793,14 +23814,15 @@
     2:2:void set(java.lang.Object):17 -> set
 com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.t.b.Z:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:27:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):24:50 -> a
-    28:56:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):67:95 -> a
-    57:57:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():95:95 -> a
-    57:57:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):96 -> a
-    58:61:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):96:99 -> a
-    1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):62:62 -> b
-    2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):61:61 -> b
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:10:java.util.Map findUniqueStaticPuts(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):25:34 -> a
+    11:37:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):49:75 -> a
+    38:66:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):92:120 -> a
+    67:67:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():95:95 -> a
+    67:67:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):121 -> a
+    68:71:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):121:124 -> a
+    1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):87:87 -> b
+    2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):86:86 -> b
 com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.t.b.a0:
     long second -> b
     long first -> a
@@ -24025,8 +24047,7 @@
     71:71:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):174:174 -> a
     72:72:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):179:179 -> a
     73:74:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):184:185 -> a
-    75:77:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):190:192 -> a
-    78:78:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):190:190 -> a
+    75:78:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):190:190 -> a
     79:79:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):197:197 -> a
     80:80: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):217:217 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):144:148 -> b
@@ -24085,8 +24106,7 @@
     75:75:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):141 -> a
     76:76: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
     77:77:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):198:198 -> a
-    78:80:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:205 -> a
-    81:81:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:203 -> a
+    78:81:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:203 -> a
     82:82:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):210:210 -> a
     83:83: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:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):157:161 -> b
@@ -24225,27 +24245,21 @@
     72:75:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):102:105 -> a
     72:75:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):480 -> a
     76:77:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):483:484 -> a
-    78:78:int getNumber():358:358 -> a
-    78:78:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):488 -> a
-    79:79:int getNumber():358:358 -> a
-    79:79:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):488 -> a
+    78:79:int getNumber():358:358 -> a
+    78:79:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):488 -> a
     80:112: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):432:464 -> a
     80:112:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487 -> a
     113:122:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:500 -> a
-    123:123:int getNumber():358:358 -> a
-    123:123:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):501 -> a
-    124:124:int getNumber():358:358 -> a
-    124:124:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):501 -> a
+    123:124:int getNumber():358:358 -> a
+    123:124:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):501 -> a
     125:160: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):387:422 -> a
     125:160:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):501 -> a
     161:177: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):411:427 -> a
     161:177:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):501 -> a
     178:179:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):507:508 -> a
     180:180:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):515:515 -> a
-    181:181:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():846:846 -> a
-    181:181:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):515 -> a
-    182:182:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():846:846 -> a
-    182:182:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):515 -> a
+    181:182:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():847:847 -> a
+    181:182:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):515 -> a
     183:189:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):519:525 -> a
     190:190:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):570:570 -> a
     191:192:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1331:1332 -> a
@@ -24489,7 +24503,7 @@
     com.android.tools.r8.ir.code.Invoke$Type getType() -> J2
     java.lang.String getTypeString() -> K2
     1:1:int requiredArgumentRegisters():108:108 -> L2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():313:313 -> L2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():314:314 -> L2
     2:2:int requiredArgumentRegisters():109 -> L2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> N
     boolean instructionTypeCanThrow() -> R0
@@ -24513,13 +24527,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():313:313 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():314:314 -> 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():313:313 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():314:314 -> 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():313:313 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():314:314 -> 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
@@ -24532,7 +24546,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():313:313 -> b
+    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():314:314 -> 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
@@ -24540,7 +24554,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():313:313 -> b
+    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():314:314 -> 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
@@ -24635,7 +24649,7 @@
     23:23:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):184:184 -> a
     23:23:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):59 -> a
     24:60:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):224:260 -> a
-    61:61: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):1041:1041 -> a
+    61:61: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):1042:1042 -> a
     61:61:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):260 -> a
     62:62:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):265:265 -> a
     63:63:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):259:259 -> a
@@ -25070,7 +25084,7 @@
     9:9: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 isMoveException() -> a2
     1:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1455:1455 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1470:1470 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> b
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
@@ -25180,39 +25194,39 @@
     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:int maxInValueRegister():71:71 -> A2
+    1:1:int maxInValueRegister():92:92 -> A2
     int maxOutValueRegister() -> B2
     int opcode() -> C2
-    1:1:com.android.tools.r8.ir.code.Value dest():50:50 -> G2
-    1:1:boolean isSpillingAllowed():199:199 -> H2
-    1:1:void markNoSpilling():195:195 -> I2
+    1:1:com.android.tools.r8.ir.code.Value dest():71:71 -> G2
+    1:1:boolean isSpillingAllowed():220:220 -> H2
+    1:1:void markNoSpilling():216:216 -> I2
     boolean hasInvariantOutType() -> L0
     boolean instructionTypeCanThrow() -> R0
-    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: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
-    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:109 -> a
-    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):114:114 -> a
-    8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):119:119 -> a
-    9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):124:124 -> a
-    10:10:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):134:134 -> a
-    11:11: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
-    12:12:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):191:191 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
-    2:2:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):210:210 -> b
-    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):220:223 -> b
-    7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):222:224 -> b
-    1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:149 -> c
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):67:67 -> a
+    2:2:com.android.tools.r8.ir.code.Value dest():71:71 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:77 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):120:120 -> a
+    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):130:130 -> a
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):135:135 -> a
+    8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):140:140 -> a
+    9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):145:145 -> a
+    10:10:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):155:155 -> a
+    11:11:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191:191 -> a
+    12:12:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):212:212 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87:87 -> b
+    2:2:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):231:231 -> b
+    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):241:244 -> b
+    7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):243:245 -> b
+    1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):161:170 -> c
     11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> c
-    11:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149 -> c
-    12:42:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150:180 -> c
-    43:43:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):145:145 -> c
-    1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):204:214 -> d
+    11:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):170 -> c
+    12:42:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:201 -> c
+    43:43:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):166:166 -> c
+    1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):225:235 -> d
     boolean isNewInstance() -> f2
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> j0
-    1:1:java.lang.String toString():61:61 -> toString
+    1:1:java.lang.String toString():82:82 -> toString
 com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.t.b.L0:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):19:21 -> a
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.t.b.M0:
@@ -25363,7 +25377,7 @@
     114:114:void addDefinitionsUser(java.util.Map):334:334 -> a
     115:118:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):364:367 -> a
     119:119:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):383:383 -> a
-    120:120:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():846:846 -> a
+    120:120:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():847:847 -> a
     120:120:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):383 -> a
     121:129:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):383:391 -> a
     boolean isPhi() -> b
@@ -25488,7 +25502,7 @@
     8:8: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
     16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> b
-    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):385:387 -> b
+    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):421:423 -> b
     24:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87 -> b
     boolean isReturn() -> m2
     com.android.tools.r8.ir.code.Return asReturn() -> o0
@@ -25587,8 +25601,7 @@
     89:89:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):149 -> a
     90:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):174:174 -> a
     91:91:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):194:194 -> a
-    92:94:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):199:201 -> a
-    95:95:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):199:199 -> a
+    92:95:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):199:199 -> a
     96:96:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):206:206 -> a
     97:97:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):211:211 -> 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):221:221 -> a
@@ -25625,8 +25638,7 @@
     75:75:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):162 -> a
     76:76: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
     77:77:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):208:208 -> a
-    78:80:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:215 -> a
-    81:81:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:213 -> a
+    78:81:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:213 -> a
     82:82: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
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):178:182 -> b
     6:6:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):238:238 -> b
@@ -25838,45 +25850,43 @@
     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>():51:215 -> <clinit>
+    1:166:void <clinit>():51:216 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):234:234 -> <init>
-    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):219:237 -> <init>
-    1:1:boolean hasDebugUsers():499:499 -> A
-    1:1:boolean hasLocalInfo():321:321 -> B
-    1:1:boolean hasPhiUsers():503:503 -> C
-    1:1:boolean hasUsers():507:507 -> D
-    1:1:boolean hasUsersInfo():630:630 -> E
-    1:1:boolean hasValueRange():1008:1008 -> F
-    1:8:boolean internalComputeNeedsRegister():778:785 -> G
-    1:1:boolean isArgument():919:919 -> H
-    1:1:boolean isConstClass():875:875 -> I
-    1:1:boolean isConstNumber():855:855 -> J
-    1:1:boolean isConstString():859:859 -> K
-    1:1:boolean isConstant():879:879 -> L
-    1:1:boolean isDexItemBasedConstString():863:863 -> M
+    2:21:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):219:238 -> <init>
+    1:1:boolean hasDebugUsers():500:500 -> A
+    1:1:boolean hasLocalInfo():322:322 -> B
+    1:1:boolean hasPhiUsers():504:504 -> C
+    1:1:boolean hasUsers():508:508 -> D
+    1:1:boolean hasUsersInfo():631:631 -> E
+    1:1:boolean hasValueRange():1009:1009 -> F
+    1:8:boolean internalComputeNeedsRegister():779:786 -> G
+    1:1:boolean isArgument():920:920 -> H
+    1:1:boolean isConstClass():876:876 -> I
+    1:1:boolean isConstNumber():856:856 -> J
+    1:1:boolean isConstString():860:860 -> K
+    1:1:boolean isConstant():880:880 -> L
+    1:1:boolean isDexItemBasedConstString():864:864 -> M
     boolean isFixedRegisterValue() -> N
-    1:1:boolean isLinked():410:410 -> O
-    1:3:boolean isNeverNull():907:909 -> P
-    1:1:boolean isThis():1000:1000 -> Q
-    1:1:boolean isUsed():539:539 -> R
-    2:2:int numberOfDebugUsers():531:531 -> R
-    2:2:boolean isUsed():539 -> R
+    1:1:boolean isLinked():411:411 -> O
+    1:3:boolean isNeverNull():908:910 -> P
+    1:1:boolean isThis():1001:1001 -> Q
+    1:1:boolean isUsed():540:540 -> R
+    2:2:int numberOfDebugUsers():532:532 -> R
+    2:2:boolean isUsed():540 -> R
     boolean isValueOnStack() -> S
-    1:3:boolean isZero():1093:1095 -> T
-    1:3:void markAsArgument():913:915 -> U
-    1:3:void markAsThis():989:991 -> V
+    1:3:boolean isZero():1094:1096 -> T
+    1:3:void markAsArgument():914:916 -> U
+    1:3:void markAsThis():990:992 -> V
     1:1:void markNonDebugLocalRead():148:148 -> W
-    1:3:boolean needsRegister():762:764 -> X
-    1:1:int numberOfAllNonDebugUsers():527:527 -> Y
-    1:1:int numberOfAllUsers():535 -> Y
-    2:2:int numberOfDebugUsers():531:531 -> Y
-    2:2:int numberOfAllUsers():535 -> Y
-    1:5:int numberOfPhiUsers():519:523 -> Z
+    1:3:boolean needsRegister():763:765 -> X
+    1:1:int numberOfAllNonDebugUsers():528:528 -> Y
+    1:1:int numberOfAllUsers():536 -> Y
+    2:2:int numberOfDebugUsers():532:532 -> Y
+    2:2:int numberOfAllUsers():536 -> Y
+    1:5:int numberOfPhiUsers():520:524 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1: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):55:67 -> a
-    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1104:1104 -> 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):68 -> a
+    1:14:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):55:68 -> a
     15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):57:57 -> a
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
     16:18:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):57 -> a
@@ -25892,120 +25902,116 @@
     117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):139:139 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):143:143 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):139 -> a
-    119:139:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):278:298 -> a
-    140:141:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):304:305 -> a
-    142:144:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):325:327 -> a
-    145:148:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):336:339 -> a
-    149:150:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):379:380 -> a
-    151:152:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):384:385 -> a
-    151:152:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):380 -> a
+    119:139:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):279:299 -> a
+    140:141:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):305:306 -> a
+    142:144:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):326:328 -> a
+    145:148:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):337:340 -> a
+    149:150:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):380:381 -> a
+    151:152:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):385:386 -> a
+    151:152:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):381 -> a
     153:161:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():183:191 -> a
-    153:161:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):385 -> a
-    153:161:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):380 -> a
+    153:161:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):386 -> a
+    153:161:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):381 -> a
     162:162:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():189:189 -> a
-    162:162:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):385 -> a
-    162:162:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):380 -> a
+    162:162:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):386 -> a
+    162:162:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):381 -> a
     163:163:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():186:186 -> a
-    163:163:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):385 -> a
-    163:163:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):380 -> a
-    164:164:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):380:380 -> a
-    165:166:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):430:431 -> a
-    167:169:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):455:457 -> a
-    170:177:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):466:473 -> a
-    178:178:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):472:472 -> a
-    179:180:void addPhiUser(com.android.tools.r8.ir.code.Phi):594:595 -> a
-    181:183:java.util.Set affectedValues():645:647 -> a
-    184:184:void addAffectedValuesTo(java.util.Set):651:651 -> a
-    185:190:void forEachAffectedValue(java.util.function.Consumer):655:660 -> a
-    191:218:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):692:719 -> a
-    219:228:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):726:735 -> a
+    163:163:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):386 -> a
+    163:163:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):381 -> a
+    164:164:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):381:381 -> a
+    165:166:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):431:432 -> a
+    167:169:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):456:458 -> a
+    170:177:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):467:474 -> a
+    178:178:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):473:473 -> a
+    179:180:void addPhiUser(com.android.tools.r8.ir.code.Phi):595:596 -> a
+    181:183:java.util.Set affectedValues():646:648 -> a
+    184:184:void addAffectedValuesTo(java.util.Set):652:652 -> a
+    185:190:void forEachAffectedValue(java.util.function.Consumer):656:661 -> a
+    191:218:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):693:720 -> a
+    219:228:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):727:736 -> a
     229:242:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):196:209 -> a
-    229:242:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):735 -> a
+    229:242:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):736 -> a
     243:243: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):197:197 -> a
-    243:243:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):735 -> a
-    244:244:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):735:735 -> a
-    245:246:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):753:754 -> a
-    247:248:void setNeedsRegister(boolean):768:769 -> a
-    249:258:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):883:892 -> a
-    259:270:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):944:955 -> a
-    271:271:void setValueRange(com.android.tools.r8.utils.LongInterval):1004:1004 -> a
-    272:272:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1036:1036 -> a
-    273:273:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1041:1041 -> a
-    273:273:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1036 -> a
-    274:301:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1058:1085 -> a
-    302:302:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1104:1104 -> a
-    303:305:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1123:1125 -> a
-    306:314:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1123:1131 -> a
-    315:315:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1104:1104 -> a
-    315:315:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1132 -> a
-    316:323:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1180:1187 -> a
-    324:324:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    324:324:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1188 -> a
-    325:345:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1189:1209 -> a
-    346:346:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    346:346:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1210 -> a
-    347:347:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1211:1211 -> a
-    1:5:int numberOfUsers():511:515 -> a0
+    243:243:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):736 -> a
+    244:244:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):736:736 -> a
+    245:246:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):754:755 -> a
+    247:248:void setNeedsRegister(boolean):769:770 -> a
+    249:258:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):884:893 -> a
+    259:270:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):945:956 -> a
+    271:271:void setValueRange(com.android.tools.r8.utils.LongInterval):1005:1005 -> a
+    272:272:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1037:1037 -> a
+    273:273:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1042:1042 -> a
+    273:273:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1037 -> a
+    274:301:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1059:1086 -> a
+    302:303:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1105:1106 -> a
+    304:307:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1125:1125 -> a
+    315:316:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1133:1134 -> a
+    317:324:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1182:1189 -> a
+    325:325:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    325:325:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1190 -> a
+    326:346:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1191:1211 -> a
+    347:347:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    347:347:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1212 -> a
+    348:348:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1213:1213 -> a
+    1:5:int numberOfUsers():512:516 -> a0
     boolean isPhi() -> b
-    1:2:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):604:605 -> b
-    3:4:void addDebugUser(com.android.tools.r8.ir.code.Instruction):609:610 -> b
-    5:13:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):740:748 -> b
-    14:36:boolean knownToBeBoolean(java.util.Set):963:985 -> b
-    37:43:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1110:1116 -> b
-    44:44:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1104:1104 -> b
-    44:44:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1117 -> b
-    45:78:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1141:1174 -> b
-    79:79:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1197:1197 -> b
-    1:15:boolean onlyDependsOnArgument():923:937 -> b0
-    16:16:boolean onlyDependsOnArgument():935:935 -> b0
-    1:1:java.util.Set aliasedUsers():451:451 -> c
-    2:4:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):455:457 -> c
-    2:4:java.util.Set aliasedUsers():451 -> c
-    5:16:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):543:554 -> c
-    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):569:570 -> c
-    19:20:void removePhiUser(com.android.tools.r8.ir.code.Phi):599:600 -> c
-    21:21:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1144:1144 -> c
-    1:1:com.android.tools.r8.ir.code.ValueType outType():846:846 -> c0
+    1:2:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):605:606 -> b
+    3:4:void addDebugUser(com.android.tools.r8.ir.code.Instruction):610:611 -> b
+    5:13:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):741:749 -> b
+    14:36:boolean knownToBeBoolean(java.util.Set):964:986 -> b
+    37:44:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1112:1119 -> b
+    45:78:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1143:1176 -> b
+    79:79:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1199:1199 -> b
+    1:15:boolean onlyDependsOnArgument():924:938 -> b0
+    16:16:boolean onlyDependsOnArgument():936:936 -> b0
+    1:1:java.util.Set aliasedUsers():452:452 -> c
+    2:4:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):456:458 -> c
+    2:4:java.util.Set aliasedUsers():452 -> c
+    5:16:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):544:555 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):570:571 -> c
+    19:20:void removePhiUser(com.android.tools.r8.ir.code.Phi):600:601 -> c
+    21:21:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1146:1146 -> c
+    1:1:com.android.tools.r8.ir.code.ValueType outType():847:847 -> c0
     1:1:int compareTo(java.lang.Object):51:51 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.ir.code.Value):807:807 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.ir.code.Value):808:808 -> compareTo
     2:2:int compareTo(java.lang.Object):51 -> compareTo
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):579:580 -> d
-    3:3:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1152:1152 -> d
-    1:1:int requiredRegisters():313:313 -> d0
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):580:581 -> d
+    3:3:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1154:1154 -> d
+    1:1:int requiredRegisters():314:314 -> d0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> e
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> e
-    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):622:626 -> e
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():446:447 -> e0
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):623:627 -> e
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():447:448 -> e0
     com.android.tools.r8.ir.code.Phi asPhi() -> f
-    1:4:void linkTo(com.android.tools.r8.ir.code.Value):389:392 -> f
-    5:6:void removeUser(com.android.tools.r8.ir.code.Instruction):574:575 -> f
-    1:4:java.util.Set uniquePhiUsers():484:487 -> f0
-    1:13:void replaceUsers(com.android.tools.r8.ir.code.Value):667:679 -> g
-    1:4:java.util.Set uniqueUsers():439:442 -> g0
-    1:6:void clearUsers():584:589 -> h
-    1:2:boolean usedInMonitorOperation():560:561 -> h0
-    1:1:int hashCode():812:812 -> hashCode
-    1:6:void clearUsersInfo():634:639 -> i
-    1:2:void computeNeedsRegister():773:774 -> j
-    1:1:java.util.Set debugUsers():491:491 -> k
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():479:480 -> l
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():269:269 -> m
-    2:2:com.android.tools.r8.ir.code.Value getAliasedValue():268:268 -> m
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():850:851 -> n
-    1:7:java.util.List getDebugLocalEnds():356:362 -> o
-    1:7:java.util.List getDebugLocalStarts():343:349 -> p
-    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():249:250 -> q
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():758:758 -> r
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():317:317 -> s
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():422:422 -> t
-    1:26:java.lang.String toString():817:842 -> toString
-    1:1:int getNumber():309:309 -> u
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():426:426 -> v
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():415 -> v
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1136:1136 -> w
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1020:1030 -> x
-    1:1:boolean hasAliasedValue():254:254 -> y
-    1:1:boolean hasAnyUsers():495:495 -> z
+    1:4:void linkTo(com.android.tools.r8.ir.code.Value):390:393 -> f
+    5:6:void removeUser(com.android.tools.r8.ir.code.Instruction):575:576 -> f
+    1:4:java.util.Set uniquePhiUsers():485:488 -> f0
+    1:13:void replaceUsers(com.android.tools.r8.ir.code.Value):668:680 -> g
+    1:4:java.util.Set uniqueUsers():440:443 -> g0
+    1:6:void clearUsers():585:590 -> h
+    1:2:boolean usedInMonitorOperation():561:562 -> h0
+    1:1:int hashCode():813:813 -> hashCode
+    1:6:void clearUsersInfo():635:640 -> i
+    1:2:void computeNeedsRegister():774:775 -> j
+    1:1:java.util.Set debugUsers():492:492 -> k
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():480:481 -> l
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():270:270 -> m
+    2:2:com.android.tools.r8.ir.code.Value getAliasedValue():269:269 -> m
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():851:852 -> n
+    1:7:java.util.List getDebugLocalEnds():357:363 -> o
+    1:7:java.util.List getDebugLocalStarts():344:350 -> p
+    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():250:251 -> q
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():759:759 -> r
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():318:318 -> s
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():423:423 -> t
+    1:26:java.lang.String toString():818:843 -> toString
+    1:1:int getNumber():310:310 -> u
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():427:427 -> v
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():416 -> v
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1138:1138 -> w
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1021:1031 -> x
+    1:1:boolean hasAliasedValue():255:255 -> y
+    1:1:boolean hasAnyUsers():496:496 -> z
 com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.t.b.m1$a:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
@@ -26018,8 +26024,7 @@
     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>():166:167 -> <clinit>
-    3:3:void <clinit>():166:166 -> <clinit>
+    1:3:void <clinit>():166:166 -> <clinit>
     1:1:void <init>(java.lang.String,int):166:166 -> <init>
 com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.t.b.n1:
     int nextValueNumber -> a
@@ -26135,9 +26140,9 @@
     1:2:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):175:176 -> 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):177 -> a
-    4:4:java.util.Set extractLeaves():185:185 -> a
+    4:4:java.util.Set extractRoots():189:189 -> a
     5:16:java.util.Set extractNodes(java.util.function.Predicate,java.util.function.Consumer):193:204 -> a
-    1:1:java.util.Set extractRoots():189:189 -> b
+    5:16:java.util.Set extractRoots():189 -> a
 com.android.tools.r8.ir.conversion.CallGraph$Node -> com.android.tools.r8.ir.conversion.d$a:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     java.util.Set callees -> c
@@ -26388,7 +26393,7 @@
     21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):132:134 -> a
     24:36:void rewriteNots():224:236 -> a
     24:36:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):135 -> 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):1045:1045 -> 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):1049:1049 -> a
     37:37:void rewriteNots():236 -> a
     37:37:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):135 -> a
     38:46:void rewriteNots():237:245 -> a
@@ -26550,10 +26555,10 @@
     1:1:int instructionCount():262:262 -> a
     2:6:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):290:294 -> a
     7:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:301 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):301 -> a
-    11:12:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):301:302 -> a
-    13:39:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):301:327 -> a
+    11:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):301:301 -> a
+    15:39:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):303:327 -> a
     40:40:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):334:334 -> a
     41:41:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.validFor(int):80:80 -> a
     41:41:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):334 -> a
@@ -26591,8 +26596,8 @@
     167:179:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):575 -> a
     180:184:void startLocals(com.android.tools.r8.ir.conversion.IRBuilder):707:711 -> a
     180:184:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):575 -> a
-    185:186:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):471:472 -> a
-    187:215:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):471:499 -> a
+    185:187:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):471:471 -> a
+    191:215:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):475:499 -> a
     216:217:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):584:585 -> a
     218:222:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):111:115 -> a
     218:222:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):585 -> a
@@ -26622,8 +26627,7 @@
     258:258:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):610:610 -> a
     259:282:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.CfFrame$FrameType):615:638 -> a
     283:283:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):652:652 -> a
-    284:289:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):804:809 -> a
-    290:290:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):804:804 -> a
+    284:290:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):804:804 -> a
     int instructionOffset(int) -> b
     void setUp() -> b
     1:4:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):455:458 -> b
@@ -26642,8 +26646,8 @@
     17:17:boolean verifyCurrentInstructionCanThrow():761 -> c
     18:19:boolean verifyCurrentInstructionCanThrow():761:762 -> c
     20:20:boolean lambda$getCanonicalDebugPositionAtOffset$0(com.android.tools.r8.cf.code.CfInstruction):777:777 -> c
-    1:2:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):773:774 -> d
-    3:25:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):773:795 -> d
+    1:3:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):773:773 -> d
+    12:25:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):782:795 -> d
     26:26:com.android.tools.r8.ir.code.Position lambda$getCanonicalDebugPositionAtOffset$1(com.android.tools.r8.cf.code.CfInstruction):778:778 -> d
     27:27:com.android.tools.r8.ir.code.Position getCurrentPosition():800:800 -> d
     1:1:boolean isCurrentlyGeneratingMethodSynchronization():420:420 -> e
@@ -26852,268 +26856,268 @@
     3:3:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):83:83 -> a
     4:7:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):142:145 -> a
     8:10:com.android.tools.r8.ir.conversion.DexBuilder$Info buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):150:152 -> a
-    11:39:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):335:363 -> a
-    40:42:boolean isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):325:327 -> a
-    40:42:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):364 -> a
-    43:68:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):366:391 -> a
-    69:69: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
-    69:69:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):391 -> a
-    70:99:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):392:421 -> a
-    100:100: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
-    100:100:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):421 -> a
-    101:103:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):424:426 -> a
-    104:105:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):584:585 -> a
-    104:105:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
-    106:108:boolean isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):592:594 -> a
-    106:108:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):586 -> a
-    106:108:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
-    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():965:965 -> 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
-    155:166:com.android.tools.r8.graph.DexCode build():184 -> a
-    167:171:void rewriteIfs():500:504 -> a
-    167:171:com.android.tools.r8.graph.DexCode build():184 -> a
-    172:172:com.android.tools.r8.graph.DexCode build():188:188 -> a
-    173:178:void reset():160:165 -> a
-    173:178:com.android.tools.r8.graph.DexCode build():191 -> a
-    179:179:int instructionNumberToIndex(int):662:662 -> a
-    179:179:void reset():165 -> a
-    179:179:com.android.tools.r8.graph.DexCode build():191 -> a
-    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():1391:1391 -> 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
-    271:290:com.android.tools.r8.graph.DexCode build():284 -> a
-    291:305:com.android.tools.r8.graph.DexCode build():285:299 -> a
-    306:306:com.android.tools.r8.code.FillArrayDataPayload com.android.tools.r8.ir.code.NewArrayFilledData.createPayload():51:51 -> a
-    306:306:com.android.tools.r8.graph.DexCode build():299 -> a
-    307:310:com.android.tools.r8.graph.DexCode build():300:303 -> a
-    311:311:com.android.tools.r8.code.FillArrayDataPayload com.android.tools.r8.ir.code.NewArrayFilledData.createPayload():51:51 -> a
-    311:311:com.android.tools.r8.graph.DexCode build():299 -> a
-    312:314:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():740:742 -> a
-    312:314:com.android.tools.r8.graph.DexCode build():307 -> a
-    315:320:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):843:848 -> a
-    315:320:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():744 -> a
-    315:320:com.android.tools.r8.graph.DexCode build():307 -> a
-    321:321:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():745:745 -> a
-    321:321:com.android.tools.r8.graph.DexCode build():307 -> a
-    322:339:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):854:871 -> a
-    322:339:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():745 -> a
-    322:339:com.android.tools.r8.graph.DexCode build():307 -> a
-    340:348:com.android.tools.r8.graph.DexCode build():310:318 -> a
-    349:350:void requestOutgoingRegisters(int):514:515 -> a
-    351:351:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):520:520 -> a
-    352:355:void addGoto(com.android.tools.r8.ir.code.Goto):530:533 -> a
-    356:370:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):538:552 -> a
-    356:370:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):562 -> a
-    371:373:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):563:565 -> a
-    374:375:void addIf(com.android.tools.r8.ir.code.If):570:571 -> a
-    376:376:void addMove(com.android.tools.r8.ir.code.Move):575:575 -> a
-    377:377:void addNop(com.android.tools.r8.ir.code.Instruction):598:598 -> a
-    377:377:void addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):604 -> a
-    378:378:void addNop(com.android.tools.r8.ir.code.Instruction):598:598 -> a
-    379:382:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):608:611 -> a
-    383:386:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):609:612 -> a
-    387:388:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):616:617 -> a
-    389:391:void addSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):621:623 -> a
-    392:393:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):627:628 -> a
-    394:395:void addArgument(com.android.tools.r8.ir.code.Argument):632:633 -> a
-    396:400:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):637:641 -> a
-    401:401:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):646:646 -> a
-    402:403:void setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):680:681 -> a
-    402:403:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):648 -> a
-    404:410:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):651:657 -> a
-    411:415:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):672:676 -> a
-    411:415:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):658 -> a
-    416:416:int instructionNumberToIndex(int):662:662 -> a
-    416:416:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):676 -> a
-    416:416:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):658 -> a
-    417:417:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):676:676 -> a
-    417:417:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):658 -> a
-    418:429:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):685:696 -> a
-    430:435:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):704:709 -> a
-    430:435:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):697 -> a
-    436:439:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):697:700 -> a
-    440:514:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):751:825 -> a
+    11:11:boolean isBuildingForComparison():156:156 -> a
+    11:11:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):643 -> a
+    12:13:void setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):677:678 -> a
+    12:13:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):645 -> a
+    14:20:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):648:654 -> a
+    21:25:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):669:673 -> a
+    21:25:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):655 -> a
+    26:26:int instructionNumberToIndex(int):659:659 -> a
+    26:26:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):673 -> a
+    26:26:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):655 -> a
+    27:27:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):673:673 -> a
+    27:27:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):655 -> a
+    28:56:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):335:363 -> a
+    57:59:boolean isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):325:327 -> a
+    57:59:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):364 -> a
+    60:85:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):366:391 -> a
+    86:86: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
+    86:86:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):391 -> a
+    87:116:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):392:421 -> a
+    117:117: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
+    117:117:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):421 -> a
+    118:120:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):424:426 -> a
+    121:122:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):584:585 -> a
+    121:122:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
+    123:125:boolean isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):592:594 -> a
+    123:125:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):586 -> a
+    123:125:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
+    126:126:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
+    126:126:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
+    127:140:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
+    141:141:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
+    141:141:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
+    142:171:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:474 -> a
+    172:183:void rewriteIfs():490:501 -> a
+    172:183:com.android.tools.r8.graph.DexCode build():184 -> a
+    184:188:void rewriteIfs():500:504 -> a
+    184:188:com.android.tools.r8.graph.DexCode build():184 -> a
+    189:189:com.android.tools.r8.graph.DexCode build():188:188 -> a
+    190:195:void reset():160:165 -> a
+    190:195:com.android.tools.r8.graph.DexCode build():191 -> a
+    196:196:int instructionNumberToIndex(int):659:659 -> a
+    196:196:void reset():165 -> a
+    196:196:com.android.tools.r8.graph.DexCode build():191 -> a
+    197:200:void reset():165:168 -> a
+    197:200:com.android.tools.r8.graph.DexCode build():191 -> a
+    201:242:com.android.tools.r8.graph.DexCode build():196:237 -> a
+    243:243:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1406:1406 -> a
+    243:243:com.android.tools.r8.graph.DexCode build():237 -> a
+    244:287:com.android.tools.r8.graph.DexCode build():238:281 -> a
+    288:307:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):711:730 -> a
+    288:307:com.android.tools.r8.graph.DexCode build():284 -> a
+    308:322:com.android.tools.r8.graph.DexCode build():285:299 -> a
+    323:323:com.android.tools.r8.code.FillArrayDataPayload com.android.tools.r8.ir.code.NewArrayFilledData.createPayload():51:51 -> a
+    323:323:com.android.tools.r8.graph.DexCode build():299 -> a
+    324:327:com.android.tools.r8.graph.DexCode build():300:303 -> a
+    328:328:com.android.tools.r8.code.FillArrayDataPayload com.android.tools.r8.ir.code.NewArrayFilledData.createPayload():51:51 -> a
+    328:328:com.android.tools.r8.graph.DexCode build():299 -> a
+    329:331:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():737:739 -> a
+    329:331:com.android.tools.r8.graph.DexCode build():307 -> a
+    332:337:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):840:845 -> a
+    332:337:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():741 -> a
+    332:337:com.android.tools.r8.graph.DexCode build():307 -> a
+    338:338:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():742:742 -> a
+    338:338:com.android.tools.r8.graph.DexCode build():307 -> a
+    339:356:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):851:868 -> a
+    339:356:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():742 -> a
+    339:356:com.android.tools.r8.graph.DexCode build():307 -> a
+    357:365:com.android.tools.r8.graph.DexCode build():310:318 -> a
+    366:367:void requestOutgoingRegisters(int):514:515 -> a
+    368:368:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):520:520 -> a
+    369:372:void addGoto(com.android.tools.r8.ir.code.Goto):530:533 -> a
+    373:387:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):538:552 -> a
+    373:387:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):562 -> a
+    388:390:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):563:565 -> a
+    391:392:void addIf(com.android.tools.r8.ir.code.If):570:571 -> a
+    393:393:void addMove(com.android.tools.r8.ir.code.Move):575:575 -> a
+    394:394:void addNop(com.android.tools.r8.ir.code.Instruction):598:598 -> a
+    394:394:void addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):604 -> a
+    395:395:void addNop(com.android.tools.r8.ir.code.Instruction):598:598 -> a
+    396:397:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):608:609 -> a
+    398:399:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):613:614 -> a
+    400:402:void addSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):618:620 -> a
+    403:404:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):624:625 -> a
+    405:406:void addArgument(com.android.tools.r8.ir.code.Argument):629:630 -> a
+    407:411:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):634:638 -> a
+    412:423:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):682:693 -> a
+    424:429:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):701:706 -> a
+    424:429:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):694 -> a
+    430:433:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):694:697 -> a
+    434:508:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):748:822 -> a
     1:1:void needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):510:510 -> b
     1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83 -> b
     2:2:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):526:526 -> b
     3:3:void addNothing(com.android.tools.r8.ir.code.Instruction):579:579 -> b
-    4:11:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):831:838 -> b
-    12:12:com.android.tools.r8.utils.InternalOptions getOptions():877:877 -> b
-    1:2:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):667:668 -> c
-    3:3:int instructionNumberToIndex(int):662:662 -> c
-    3:3:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):668 -> c
-    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
+    4:11:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):828:835 -> b
+    12:12:com.android.tools.r8.utils.InternalOptions getOptions():874:874 -> b
+    1:2:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):664:665 -> c
+    3:3:int instructionNumberToIndex(int):659:659 -> c
+    3:3:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):665 -> c
+    4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):665:665 -> c
+    5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():878:878 -> c
     1:1:boolean isBuildingForComparison():156:156 -> d
 com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.ir.conversion.A:
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1050:1050 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1047:1047 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1079:1079 -> a
+    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1076:1076 -> a
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
 com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.ir.conversion.B:
     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>
+    1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1522:1524 -> <init>
 com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.ir.conversion.C:
     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
-    3:3:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):984:984 -> a
-    4:5:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):989:990 -> a
-    1:1:int getSize():963:963 -> d
-    1:1:int maxSize():973:973 -> e
-    1:1:int minSize():968:968 -> f
+    1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):954:955 -> <init>
+    1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):975:976 -> a
+    3:3:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):981:981 -> a
+    4:5:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):986:987 -> a
+    1:1:int getSize():960:960 -> d
+    1:1:int maxSize():970:970 -> e
+    1:1:int minSize():965:965 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.ir.conversion.D:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1083:1083 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1088:1088 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1085:1085 -> <init>
-    1:1:com.android.tools.r8.ir.code.Goto getJump():1092:1092 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1156 -> a
-    2:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1157:1201 -> a
-    47:51:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1190:1194 -> a
-    52:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1185:1204 -> a
-    72:72:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1115:1115 -> a
-    73:73:com.android.tools.r8.ir.code.Goto getJump():1092:1092 -> a
-    73:73:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1116 -> a
-    74:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1117:1151 -> a
-    109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1210:1210 -> a
-    1:2:int getSize():1097:1098 -> d
-    1:1:int maxSize():1109:1109 -> e
-    1:1:int minSize():1103:1103 -> f
+    1:1:void <clinit>():1080:1080 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1085:1085 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1082:1082 -> <init>
+    1:1:com.android.tools.r8.ir.code.Goto getJump():1089:1089 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1153 -> a
+    2:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1154:1198 -> a
+    47:51:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1187:1191 -> a
+    52:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1182:1201 -> a
+    72:72:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1112:1112 -> a
+    73:73:com.android.tools.r8.ir.code.Goto getJump():1089:1089 -> a
+    73:73:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1113 -> a
+    74:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1114:1148 -> a
+    109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1207:1207 -> a
+    1:2:int getSize():1094:1095 -> d
+    1:1:int maxSize():1106:1106 -> e
+    1:1:int minSize():1100:1100 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.ir.conversion.E:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1214:1214 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.If):1219:1219 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.If):1216:1216 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    1:1:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1260 -> a
-    2:2:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1260 -> a
-    3:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1261:1271 -> a
-    14:14:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    14:14:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    14:14:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1239 -> a
-    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1271 -> a
-    15:15:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    15:15:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1239 -> a
-    15:15:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1271 -> a
-    16:17:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1240:1241 -> a
-    16:17:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1271 -> a
-    18:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1271:1278 -> a
-    26:26:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    26:26:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    26:26:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1279 -> a
-    27:27:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    27:27:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1279 -> a
-    28:45:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1279:1296 -> a
-    46:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1293:1293 -> a
-    47:47:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1290:1290 -> a
-    48:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1287:1287 -> a
-    49:49:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1284:1284 -> a
-    50:69:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1281:1300 -> a
-    70:70:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    70:70:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    70:70:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1301 -> a
-    71:71:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    71:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1301 -> a
-    72:89:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1301:1318 -> a
-    90:90:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1315:1315 -> a
-    91:91:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1312:1312 -> a
-    92:92:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1309:1309 -> a
-    93:93:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1306:1306 -> a
-    94:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1303:1303 -> a
-    95:95:int getOffset():1214:1214 -> a
-    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1322 -> a
-    96:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1322:1323 -> a
-    98:98:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    98:98:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    98:98:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1245 -> a
-    98:98:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    99:99:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    99:99:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1245 -> a
-    99:99:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    100:100:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1245:1245 -> a
-    100:100:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    101:101:int getMaxOffset():1214:1214 -> a
-    101:101:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1246 -> a
-    101:101:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    102:102:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1247:1247 -> a
-    102:102:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    103:103:int getOffset():1214:1214 -> a
-    103:103:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1249 -> a
-    103:103:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    104:104:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1249:1249 -> a
-    104:104:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    105:105:int getOffset():1214:1214 -> a
-    105:105:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1254 -> a
-    105:105:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    106:106:int getOffset():1214:1214 -> a
-    106:106:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1255 -> a
-    106:106:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    107:107:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    107:107:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    107:107:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1329 -> a
-    108:108:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    108:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1329 -> a
-    109:109:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1329:1329 -> a
-    110:110:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    110:110:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    110:110:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1239 -> a
-    110:110:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    111:111:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    111:111:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1239 -> a
-    111:111:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    112:113:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1240:1241 -> a
-    112:113:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    114:114:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331:1331 -> a
-    115:115:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    116:116:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    116:116:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    116:116:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1223 -> a
-    117:117:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    117:117:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1223 -> a
-    118:118:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1224:1224 -> a
-    119:119:void setMaxOffset(int):1214:1214 -> a
-    120:123:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1352:1355 -> a
-    124:124:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    124:124:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    124:124:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1356 -> a
-    125:125:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    125:125:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1356 -> a
-    126:126:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1356:1356 -> a
-    127:127:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> a
-    127:127:com.android.tools.r8.ir.code.If getBranch():1235 -> a
-    127:127:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1356 -> a
-    128:128:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> a
-    128:128:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1356 -> a
-    129:130:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1356:1357 -> a
-    1:1:int getMaxOffset():1214:1214 -> b
-    2:2:com.android.tools.r8.ir.code.Instruction getIR():1214:1214 -> b
-    2:2:com.android.tools.r8.ir.code.If getBranch():1235 -> b
-    2:2:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1228 -> b
-    3:3:com.android.tools.r8.ir.code.If getBranch():1235:1235 -> b
-    3:3:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1228 -> b
-    4:7:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1228:1231 -> b
-    8:8:void setMinOffset(int):1214:1214 -> b
-    1:1:int getOffset():1214:1214 -> c
-    2:2:void setOffset(int):1214:1214 -> c
-    1:1:int getSize():1347:1347 -> d
+    1:1:void <clinit>():1211:1211 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.If):1216:1216 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.If):1213:1213 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    1:1:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1257 -> a
+    2:2:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1257 -> a
+    3:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1258:1268 -> a
+    14:14:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    14:14:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    14:14:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236 -> a
+    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1268 -> a
+    15:15:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    15:15:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236 -> a
+    15:15:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1268 -> a
+    16:17:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1237:1238 -> a
+    16:17:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1268 -> a
+    18:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1268:1275 -> a
+    26:26:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    26:26:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    26:26:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1276 -> a
+    27:27:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    27:27:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1276 -> a
+    28:45:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1276:1293 -> a
+    46:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1290:1290 -> a
+    47:47:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1287:1287 -> a
+    48:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1284:1284 -> a
+    49:49:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1281:1281 -> a
+    50:69:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1278:1297 -> a
+    70:70:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    70:70:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    70:70:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1298 -> a
+    71:71:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    71:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1298 -> a
+    72:89:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1298:1315 -> a
+    90:90:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1312:1312 -> a
+    91:91:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1309:1309 -> a
+    92:92:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1306:1306 -> a
+    93:93:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1303:1303 -> a
+    94:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1300:1300 -> a
+    95:95:int getOffset():1211:1211 -> a
+    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1319 -> a
+    96:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1319:1320 -> a
+    98:98:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    98:98:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    98:98:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1242 -> a
+    98:98:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    99:99:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    99:99:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1242 -> a
+    99:99:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    100:100:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1242:1242 -> a
+    100:100:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    101:101:int getMaxOffset():1211:1211 -> a
+    101:101:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1243 -> a
+    101:101:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    102:102:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1244:1244 -> a
+    102:102:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    103:103:int getOffset():1211:1211 -> a
+    103:103:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1246 -> a
+    103:103:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    104:104:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1246:1246 -> a
+    104:104:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    105:105:int getOffset():1211:1211 -> a
+    105:105:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1251 -> a
+    105:105:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    106:106:int getOffset():1211:1211 -> a
+    106:106:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1252 -> a
+    106:106:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    107:107:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    107:107:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    107:107:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1326 -> a
+    108:108:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    108:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1326 -> a
+    109:109:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1326:1326 -> a
+    110:110:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    110:110:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    110:110:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236 -> a
+    110:110:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
+    111:111:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    111:111:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236 -> a
+    111:111:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
+    112:113:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1237:1238 -> a
+    112:113:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
+    114:114:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328:1328 -> a
+    115:115:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    116:116:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    116:116:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    116:116:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1220 -> a
+    117:117:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    117:117:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1220 -> a
+    118:118:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1221:1221 -> a
+    119:119:void setMaxOffset(int):1211:1211 -> a
+    120:123:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1349:1352 -> a
+    124:124:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    124:124:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    124:124:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353 -> a
+    125:125:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    125:125:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353 -> a
+    126:126:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    127:127:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> a
+    127:127:com.android.tools.r8.ir.code.If getBranch():1232 -> a
+    127:127:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353 -> a
+    128:128:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> a
+    128:128:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353 -> a
+    129:130:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353:1354 -> a
+    1:1:int getMaxOffset():1211:1211 -> b
+    2:2:com.android.tools.r8.ir.code.Instruction getIR():1211:1211 -> b
+    2:2:com.android.tools.r8.ir.code.If getBranch():1232 -> b
+    2:2:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1225 -> b
+    3:3:com.android.tools.r8.ir.code.If getBranch():1232:1232 -> b
+    3:3:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1225 -> b
+    4:7:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1225:1228 -> b
+    8:8:void setMinOffset(int):1211:1211 -> b
+    1:1:int getOffset():1211:1211 -> c
+    2:2:void setOffset(int):1211:1211 -> c
+    1:1:int getSize():1344:1344 -> d
     int maxSize() -> e
     int minSize() -> f
 com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.ir.conversion.F:
@@ -27121,97 +27125,97 @@
     int offset -> b
     int maxOffset -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():885:885 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):894:894 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):889:896 -> <init>
+    1:1:void <clinit>():882:882 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):891:891 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):886:893 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
     boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:2:void setMaxOffset(int):941:942 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction getIR():946:946 -> a
-    1:1:void setMinOffset(int):931:931 -> b
-    2:3:int getMaxOffset():936:937 -> b
-    1:2:int getOffset():916:917 -> c
-    3:4:void setOffset(int):921:922 -> c
+    1:2:void setMaxOffset(int):938:939 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction getIR():943:943 -> a
+    1:1:void setMinOffset(int):928:928 -> b
+    2:3:int getMaxOffset():933:934 -> b
+    1:2:int getOffset():913:914 -> c
+    3:4:void setOffset(int):918:919 -> c
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
 com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.ir.conversion.G:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1361:1361 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Move):1366:1366 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Move):1363:1363 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1361:1361 -> a
-    1:1:com.android.tools.r8.ir.code.Move getMove():1370 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1409 -> a
-    2:2:com.android.tools.r8.ir.code.Move getMove():1370:1370 -> a
-    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1409 -> a
-    3:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1410:1453 -> a
-    47:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1431:1438 -> a
-    55:63:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1417:1425 -> a
-    64:64:int getOffset():1361:1361 -> a
-    64:64:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1455 -> a
-    65:66:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1455:1456 -> a
-    67:67:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1427:1427 -> a
-    68:68:com.android.tools.r8.ir.code.Instruction getIR():1361:1361 -> a
-    69:69:void setMaxOffset(int):1361:1361 -> a
-    70:75:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1383:1388 -> a
-    76:87:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1393:1404 -> a
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1361:1361 -> b
-    1:1:com.android.tools.r8.ir.code.Move getMove():1370 -> b
-    1:1:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1378 -> b
-    2:2:com.android.tools.r8.ir.code.Move getMove():1370:1370 -> b
-    2:2:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1378 -> b
-    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1378:1378 -> b
-    4:4:com.android.tools.r8.ir.code.Instruction getIR():1361:1361 -> b
-    4:4:com.android.tools.r8.ir.code.Move getMove():1370 -> b
-    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1378 -> b
-    5:5:com.android.tools.r8.ir.code.Move getMove():1370:1370 -> b
-    5:5:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1378 -> b
-    6:6:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1378:1378 -> b
-    7:7:int getMaxOffset():1361:1361 -> b
-    8:8:void setMinOffset(int):1361:1361 -> b
-    1:1:int getOffset():1361:1361 -> c
-    2:2:void setOffset(int):1361:1361 -> c
-    3:3:com.android.tools.r8.ir.code.Instruction getIR():1361:1361 -> c
-    3:3:com.android.tools.r8.ir.code.Move getMove():1370 -> c
-    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374 -> c
-    4:4:com.android.tools.r8.ir.code.Move getMove():1370:1370 -> c
-    4:4:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374 -> c
-    5:5:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374:1374 -> c
-    6:6:com.android.tools.r8.ir.code.Instruction getIR():1361:1361 -> c
-    6:6:com.android.tools.r8.ir.code.Move getMove():1370 -> c
-    6:6:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374 -> c
-    7:7:com.android.tools.r8.ir.code.Move getMove():1370:1370 -> c
-    7:7:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374 -> c
-    8:8:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374:1374 -> c
-    1:2:int getSize():1473:1474 -> d
-    1:1:int maxSize():1467:1467 -> e
-    1:1:int minSize():1461:1461 -> f
+    1:1:void <clinit>():1358:1358 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Move):1363:1363 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Move):1360:1360 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1358:1358 -> a
+    1:1:com.android.tools.r8.ir.code.Move getMove():1367 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1406 -> a
+    2:2:com.android.tools.r8.ir.code.Move getMove():1367:1367 -> a
+    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1406 -> a
+    3:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1407:1450 -> a
+    47:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1428:1435 -> a
+    55:63:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1414:1422 -> a
+    64:64:int getOffset():1358:1358 -> a
+    64:64:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1452 -> a
+    65:66:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1452:1453 -> a
+    67:67:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1424:1424 -> a
+    68:68:com.android.tools.r8.ir.code.Instruction getIR():1358:1358 -> a
+    69:69:void setMaxOffset(int):1358:1358 -> a
+    70:75:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1380:1385 -> a
+    76:87:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1390:1401 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1358:1358 -> b
+    1:1:com.android.tools.r8.ir.code.Move getMove():1367 -> b
+    1:1:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375 -> b
+    2:2:com.android.tools.r8.ir.code.Move getMove():1367:1367 -> b
+    2:2:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375 -> b
+    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375:1375 -> b
+    4:4:com.android.tools.r8.ir.code.Instruction getIR():1358:1358 -> b
+    4:4:com.android.tools.r8.ir.code.Move getMove():1367 -> b
+    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375 -> b
+    5:5:com.android.tools.r8.ir.code.Move getMove():1367:1367 -> b
+    5:5:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375 -> b
+    6:6:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375:1375 -> b
+    7:7:int getMaxOffset():1358:1358 -> b
+    8:8:void setMinOffset(int):1358:1358 -> b
+    1:1:int getOffset():1358:1358 -> c
+    2:2:void setOffset(int):1358:1358 -> c
+    3:3:com.android.tools.r8.ir.code.Instruction getIR():1358:1358 -> c
+    3:3:com.android.tools.r8.ir.code.Move getMove():1367 -> c
+    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371 -> c
+    4:4:com.android.tools.r8.ir.code.Move getMove():1367:1367 -> c
+    4:4:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371 -> c
+    5:5:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371:1371 -> c
+    6:6:com.android.tools.r8.ir.code.Instruction getIR():1358:1358 -> c
+    6:6:com.android.tools.r8.ir.code.Move getMove():1367 -> c
+    6:6:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371 -> c
+    7:7:com.android.tools.r8.ir.code.Move getMove():1367:1367 -> c
+    7:7:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371 -> c
+    8:8:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371:1371 -> c
+    1:2:int getSize():1470:1471 -> d
+    1:1:int maxSize():1464:1464 -> e
+    1:1:int minSize():1458:1458 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.ir.conversion.H:
     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>
-    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1012:1012 -> a
-    2:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1017:1021 -> a
-    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1042:1043 -> a
-    1:1:int getSize():1037:1037 -> d
-    1:1:int maxSize():1032:1032 -> e
-    1:1:int minSize():1027:1027 -> f
+    1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):998:1004 -> <init>
+    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1009:1009 -> a
+    2:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1014:1018 -> a
+    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1039:1040 -> a
+    1:1:int getSize():1034:1034 -> d
+    1:1:int maxSize():1029:1029 -> e
+    1:1:int minSize():1024:1024 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.ir.conversion.I:
     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>
+    1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):1511:1513 -> <init>
 com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.ir.conversion.J:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
-    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1497:1500 -> <init>
-    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1505:1505 -> a
-    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
+    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1494:1497 -> <init>
+    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1502:1502 -> a
+    1:1:int compareTo(java.lang.Object):1488:1488 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1502:1502 -> compareTo
+    2:2:int compareTo(java.lang.Object):1488 -> compareTo
 com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.ir.conversion.L:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Position currentPosition -> i
@@ -27235,60 +27239,57 @@
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:1:int instructionCount():105:105 -> a
     2:6:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):141:145 -> a
-    7:34:void buildArgumentsWithUnusedArgumentStubs(com.android.tools.r8.ir.conversion.IRBuilder,int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):161:188 -> a
-    35:46:void buildArgumentsWithUnusedArgumentStubs(com.android.tools.r8.ir.conversion.IRBuilder,int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):187:198 -> a
-    47:59:void buildArgumentsWithUnusedArgumentStubs(com.android.tools.r8.ir.conversion.IRBuilder,int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):196:208 -> a
-    60:60:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):225:225 -> a
-    61:61:int instructionOffset(int):337:337 -> a
-    61:61:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):270 -> a
-    61:61:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):225 -> a
-    62:70:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):270:278 -> a
-    62:70:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):225 -> a
-    71:71:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):296:296 -> a
-    71:71:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):226 -> a
-    72:72:int instructionOffset(int):337:337 -> a
-    72:72:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
-    72:72:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):226 -> a
-    73:79:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):300:306 -> a
-    73:79:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):226 -> a
-    80:81:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):227:228 -> a
-    82:85:int getMoveExceptionRegister(int):238:241 -> a
-    86:87:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):313:314 -> a
-    88:96:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):313:321 -> a
-    97:97:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):316:316 -> a
-    98:99:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):343:344 -> a
-    100:100:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):343:343 -> a
-    101:104:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):350:353 -> a
-    105:105:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):350:350 -> a
-    106:106:boolean isMoveResult(com.android.tools.r8.code.Instruction):376:376 -> a
-    107:139:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):383:415 -> a
-    140:140:java.util.Set getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):490:490 -> a
-    140:140:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):415 -> a
-    141:146:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):415:420 -> a
-    147:147:boolean isInvoke(com.android.tools.r8.code.Instruction):357:357 -> a
-    147:147:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):420 -> a
-    148:168:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):420:440 -> a
-    169:178:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):462:471 -> a
-    179:180:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):468:469 -> a
-    181:189:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):476:484 -> a
-    190:191:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):494:495 -> a
-    192:192:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):495:495 -> a
+    7:34:void buildArgumentsWithUnusedArgumentStubs(com.android.tools.r8.ir.conversion.IRBuilder,int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):162:189 -> a
+    35:46:void buildArgumentsWithUnusedArgumentStubs(com.android.tools.r8.ir.conversion.IRBuilder,int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):188:199 -> a
+    47:59:void buildArgumentsWithUnusedArgumentStubs(com.android.tools.r8.ir.conversion.IRBuilder,int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):197:209 -> a
+    60:60:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):226:226 -> a
+    61:61:int instructionOffset(int):338:338 -> a
+    61:61:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):271 -> a
+    61:61:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):226 -> a
+    62:70:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):271:279 -> a
+    62:70:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):226 -> a
+    71:71:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):297:297 -> a
+    71:71:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):227 -> a
+    72:72:int instructionOffset(int):338:338 -> a
+    72:72:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):300 -> a
+    72:72:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):227 -> a
+    73:79:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):301:307 -> a
+    73:79:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):227 -> a
+    80:81:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):228:229 -> a
+    82:85:int getMoveExceptionRegister(int):239:242 -> a
+    86:88:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):314:314 -> a
+    91:97:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):317:317 -> a
+    98:100:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):344:344 -> a
+    101:105:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):351:351 -> a
+    106:106:boolean isMoveResult(com.android.tools.r8.code.Instruction):377:377 -> a
+    107:139:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):384:416 -> a
+    140:140:java.util.Set getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):491:491 -> a
+    140:140:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):416 -> a
+    141:146:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):416:421 -> a
+    147:147:boolean isInvoke(com.android.tools.r8.code.Instruction):358:358 -> a
+    147:147:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):421 -> a
+    148:168:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):421:441 -> a
+    169:178:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):463:472 -> a
+    179:180:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):469:470 -> a
+    181:189:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):477:485 -> a
+    190:191:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):495:496 -> a
+    192:192:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):496:496 -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
     1:8:void setUp():126:133 -> b
-    9:9:int instructionOffset(int):337:337 -> b
+    9:9:int instructionOffset(int):338:338 -> b
     com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):233:233 -> c
-    2:2:boolean verifyCurrentInstructionCanThrow():261:261 -> c
-    1:2:void clear():326:327 -> clear
-    1:4:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):248:251 -> d
-    5:5:com.android.tools.r8.ir.code.Position getCurrentPosition():256:256 -> d
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):234:234 -> c
+    2:2:boolean verifyCurrentInstructionCanThrow():262:262 -> c
+    1:2:void clear():327:328 -> clear
+    1:4:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):249:252 -> d
+    5:5:com.android.tools.r8.ir.code.Position getCurrentPosition():257:257 -> d
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     1:1:boolean verifyRegister(int):100:100 -> f
-    1:1:int instructionIndex(int):332:332 -> g
-    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):284:286 -> h
-    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
+    1:1:int instructionIndex(int):333:333 -> g
+    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):285:287 -> h
+    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):454:454 -> i
+    2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):449:449 -> i
+    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):455 -> i
 com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.ir.conversion.M:
     void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField) -> a
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
@@ -27297,875 +27298,869 @@
     void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
     void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField) -> b
 com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.ir.conversion.N:
-    com.android.tools.r8.ir.conversion.SourceCode source -> v
+    java.util.List argumentValues -> r
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
-    boolean $assertionsDisabled -> J
-    java.util.List argumentValues -> t
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> i
-    com.android.tools.r8.ir.code.Value receiverValue -> s
-    boolean throwingInstructionInCurrentBlock -> w
-    int nextBlockNumber -> A
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement FLOAT -> F
+    boolean throwingInstructionInCurrentBlock -> u
+    java.util.List impreciseInstructions -> z
+    com.android.tools.r8.ir.code.Value receiverValue -> q
     com.android.tools.r8.graph.DexEncodedMethod method -> l
     java.util.Set processedSubroutineInstructions -> e
+    com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> p
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap offsets -> b
     boolean[] processedInstructions -> d
+    int nextBlockNumber -> y
     java.util.LinkedList blocks -> g
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement DOUBLE -> H
+    boolean hasImpreciseValues -> A
+    boolean $assertionsDisabled -> C
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap targets -> a
-    boolean hasImpreciseValues -> C
+    com.android.tools.r8.ir.conversion.SourceCode source -> t
     com.android.tools.r8.ir.code.BasicBlock entryBlock -> h
     com.android.tools.r8.origin.Origin origin -> o
     java.util.Queue traceBlocksWorklist -> c
-    com.android.tools.r8.ir.code.Value previousLocalValue -> x
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap uninitializedDebugLocalValues -> z
-    java.util.List pendingArgumentInstructions -> u
-    com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription prototypeChanges -> p
+    com.android.tools.r8.ir.code.Value previousLocalValue -> v
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap uninitializedDebugLocalValues -> x
+    java.util.List pendingArgumentInstructions -> s
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> k
-    java.util.List debugLocalEnds -> y
+    java.util.List debugLocalEnds -> w
     com.android.tools.r8.graph.DexEncodedMethod context -> m
     com.android.tools.r8.graph.AppView appView -> n
-    java.util.List impreciseInstructions -> B
-    com.android.tools.r8.ir.code.IRMetadata metadata -> D
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement INT -> E
-    java.util.ListIterator removedArgumentsIterator -> q
-    int argumentCount -> r
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement NULL -> I
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement LONG -> G
-    1:7:void <clinit>():140:146 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.ValueNumberGenerator):436:436 -> <init>
-    2:95:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.ValueNumberGenerator):366:459 -> <init>
-    96:104:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.ValueNumberGenerator):454:462 -> <init>
-    1:4:boolean verifyMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense):466:469 -> a
-    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):496:497 -> a
-    8:26:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):513:531 -> a
-    27:29:void markIndexProcessed(int):2373:2375 -> a
-    27:29:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):536 -> a
-    30:31:void ensureSubroutineProcessedInstructions():2383:2384 -> a
-    30:31:void markIndexProcessed(int):2378 -> a
-    30:31:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):536 -> a
-    32:32:void markIndexProcessed(int):2379:2379 -> a
-    32:32:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):536 -> a
-    33:43:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):537:547 -> a
-    44:44:void ensureNormalSuccessorBlock(int,int):2404:2404 -> a
-    44:44:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):548 -> a
-    45:47:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):554:556 -> a
-    48:48:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):502:502 -> a
-    48:48:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):556 -> a
-    49:54:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):557:562 -> a
-    55:60:void processWorklist():753:758 -> a
-    55:60:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    61:61:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):502:502 -> a
-    61:61:void processWorklist():758 -> a
-    61:61:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    62:66:void processWorklist():759:763 -> a
-    62:66:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    67:91:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):804:828 -> a
-    67:91:void processWorklist():763 -> a
-    67:91:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    92:97:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):827:832 -> a
-    92:97:void processWorklist():763 -> a
-    92:97:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    98:105:void processWorklist():764:771 -> a
-    98:105:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    106:116:void processWorklist():770:780 -> a
-    106:116:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    117:117:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    117:117:void processWorklist():780 -> a
-    117:117:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    118:127:void processWorklist():784:793 -> a
-    118:127:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    128:131:void closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2449:2452 -> a
-    128:131:void processWorklist():793 -> a
-    128:131:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    132:133:void processWorklist():796:797 -> a
-    132:133:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    134:134:void processWorklist():753:753 -> a
-    134:134:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):563 -> a
-    135:140:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):566:571 -> a
-    141:142:boolean verifyFilledPredecessors():692:693 -> a
-    141:142:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
-    143:148:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):699:704 -> a
-    143:148:boolean verifyFilledPredecessors():693 -> a
-    143:148:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
+    com.android.tools.r8.ir.code.IRMetadata metadata -> B
+    1:1:void <clinit>():146:146 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.ValueNumberGenerator):434:434 -> <init>
+    2:93:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.ValueNumberGenerator):366:457 -> <init>
+    94:94:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.ValueNumberGenerator):452:452 -> <init>
+    1:4:boolean verifyMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense):463:466 -> a
+    5:5:boolean verifyMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense):465:465 -> a
+    6:7:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):497:498 -> a
+    8:26:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):514:532 -> a
+    27:29:void markIndexProcessed(int):2369:2371 -> a
+    27:29:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):537 -> a
+    30:31:void ensureSubroutineProcessedInstructions():2379:2380 -> a
+    30:31:void markIndexProcessed(int):2374 -> a
+    30:31:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):537 -> a
+    32:32:void markIndexProcessed(int):2375:2375 -> a
+    32:32:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):537 -> a
+    33:43:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):538:548 -> a
+    44:44:void ensureNormalSuccessorBlock(int,int):2400:2400 -> a
+    44:44:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):549 -> a
+    45:47:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):555:557 -> a
+    48:48:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):503:503 -> a
+    48:48:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):557 -> a
+    49:54:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):558:563 -> a
+    55:60:void processWorklist():754:759 -> a
+    55:60:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    61:61:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):503:503 -> a
+    61:61:void processWorklist():759 -> a
+    61:61:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    62:66:void processWorklist():760:764 -> a
+    62:66:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    67:91:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):805:829 -> a
+    67:91:void processWorklist():764 -> a
+    67:91:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    92:97:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):828:833 -> a
+    92:97:void processWorklist():764 -> a
+    92:97:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    98:105:void processWorklist():765:772 -> a
+    98:105:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    106:116:void processWorklist():771:781 -> a
+    106:116:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    117:117:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    117:117:void processWorklist():781 -> a
+    117:117:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    118:127:void processWorklist():785:794 -> a
+    118:127:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    128:131:void closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2445:2448 -> a
+    128:131:void processWorklist():794 -> a
+    128:131:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    132:133:void processWorklist():797:798 -> a
+    132:133:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    134:134:void processWorklist():754:754 -> a
+    134:134:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):564 -> a
+    135:140:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567:572 -> a
+    141:142:boolean verifyFilledPredecessors():693:694 -> a
+    141:142:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):572 -> a
+    143:148:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700:705 -> a
+    143:148:boolean verifyFilledPredecessors():694 -> a
+    143:148:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):572 -> 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):704 -> a
-    149:149:boolean verifyFilledPredecessors():693 -> a
-    149:149:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
-    150:157:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):721:728 -> a
-    150:157:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):704 -> a
-    150:157:boolean verifyFilledPredecessors():693 -> a
-    150:157:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
-    158:161:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):744:747 -> a
-    158:161:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):728 -> a
-    158:161:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):704 -> a
-    158:161:boolean verifyFilledPredecessors():693 -> a
-    158:161:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
-    162:162:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):745:745 -> a
-    162:162:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):728 -> a
-    162:162:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):704 -> a
-    162:162:boolean verifyFilledPredecessors():693 -> a
-    162:162:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
-    163:170:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):732:739 -> a
-    163:170:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):704 -> a
-    163:170:boolean verifyFilledPredecessors():693 -> a
-    163:170:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
-    171:177:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):704:710 -> a
-    171:177:boolean verifyFilledPredecessors():693 -> a
-    171:177:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
-    178:178:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):707:707 -> a
-    178:178:boolean verifyFilledPredecessors():693 -> a
-    178:178:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
-    179:185:void insertDebugPositions():661:667 -> a
-    179:185:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
+    149:149:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):705 -> a
+    149:149:boolean verifyFilledPredecessors():694 -> a
+    149:149:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):572 -> a
+    150:157:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):722:729 -> a
+    150:157:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):705 -> a
+    150:157:boolean verifyFilledPredecessors():694 -> a
+    150:157:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):572 -> a
+    158:161:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):745:748 -> a
+    158:161:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):729 -> a
+    158:161:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):705 -> a
+    158:161:boolean verifyFilledPredecessors():694 -> a
+    158:161:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):572 -> a
+    162:162:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):746:746 -> a
+    162:162:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):729 -> a
+    162:162:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):705 -> a
+    162:162:boolean verifyFilledPredecessors():694 -> a
+    162:162:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):572 -> a
+    163:170:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):733:740 -> a
+    163:170:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):705 -> a
+    163:170:boolean verifyFilledPredecessors():694 -> a
+    163:170:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):572 -> a
+    171:177:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):705:711 -> a
+    171:177:boolean verifyFilledPredecessors():694 -> a
+    171:177:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):572 -> a
+    178:178:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):708:708 -> a
+    178:178:boolean verifyFilledPredecessors():694 -> a
+    178:178:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):572 -> a
+    179:185:void insertDebugPositions():662:668 -> a
+    179:185:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575 -> a
     186:186:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():29:29 -> a
-    186:186:void insertDebugPositions():668 -> a
-    186:186:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
-    187:199:void insertDebugPositions():669:681 -> a
-    187:199:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
+    186:186:void insertDebugPositions():669 -> a
+    186:186:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575 -> a
+    187:199:void insertDebugPositions():670:682 -> a
+    187:199:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575 -> a
     200:200:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():29:29 -> a
-    200:200:void insertDebugPositions():682 -> a
-    200:200:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
+    200:200:void insertDebugPositions():683 -> a
+    200:200:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575 -> a
     201:201:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):29:29 -> a
-    201:201:void insertDebugPositions():683 -> a
-    201:201:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
+    201:201:void insertDebugPositions():684 -> a
+    201:201:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575 -> a
     202:202:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():29:29 -> a
-    202:202:void insertDebugPositions():684 -> a
-    202:202:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
-    203:204:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):577:578 -> 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):578 -> a
-    206:208:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):579:581 -> a
+    202:202:void insertDebugPositions():685 -> a
+    202:202:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575 -> a
+    203:204:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):578:579 -> a
+    205:205:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> a
+    205:205:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):579 -> a
+    206:208:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):580:582 -> a
     209:209:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():29:29 -> a
-    209:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):581 -> a
-    210:215:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):582:587 -> a
+    209:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):582 -> a
+    210:215:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):583:588 -> a
     216:216:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):29:29 -> a
-    216:216:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):588 -> a
-    217:218:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):595:596 -> a
-    219:249:void joinPredecessorsWithIdenticalPhis():2537:2567 -> a
-    219:249:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):601 -> 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():2567 -> a
-    250:250:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):601 -> a
-    251:251:void joinPredecessorsWithIdenticalPhis():2567:2567 -> a
-    251:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):601 -> a
-    252:266:void joinPredecessorsWithIdenticalPhis():2566:2580 -> a
-    252:266:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):601 -> a
+    216:216:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):589 -> a
+    217:218:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):596:597 -> a
+    219:249:void joinPredecessorsWithIdenticalPhis():2533:2563 -> a
+    219:249:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):602 -> a
+    250:250:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> a
+    250:250:void joinPredecessorsWithIdenticalPhis():2563 -> a
+    250:250:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):602 -> a
+    251:251:void joinPredecessorsWithIdenticalPhis():2563:2563 -> a
+    251:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):602 -> a
+    252:266:void joinPredecessorsWithIdenticalPhis():2562:2576 -> a
+    252:266:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):602 -> a
     267:278:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):506:517 -> a
-    267:278:void joinPredecessorsWithIdenticalPhis():2584 -> a
-    267:278:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):601 -> a
-    279:279:void joinPredecessorsWithIdenticalPhis():2585:2585 -> a
-    279:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):601 -> a
-    280:280:void joinPredecessorsWithIdenticalPhis():2543:2543 -> a
-    280:280:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):601 -> a
+    267:278:void joinPredecessorsWithIdenticalPhis():2580 -> a
+    267:278:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):602 -> a
+    279:279:void joinPredecessorsWithIdenticalPhis():2581:2581 -> a
+    279:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):602 -> a
+    280:280:void joinPredecessorsWithIdenticalPhis():2539:2539 -> a
+    280:280:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):602 -> a
     281:281:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    281:281:void joinPredecessorsWithIdenticalPhis():2543 -> a
-    281:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):601 -> a
-    282:326:void joinPredecessorsWithIdenticalPhis():2543:2587 -> a
-    282:326:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):601 -> a
-    327:334:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):604:611 -> a
-    335:335:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1122:1122 -> a
-    335:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):614 -> a
-    336:344:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):615:623 -> a
+    281:281:void joinPredecessorsWithIdenticalPhis():2539 -> a
+    281:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):602 -> a
+    282:326:void joinPredecessorsWithIdenticalPhis():2539:2583 -> a
+    282:326:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):602 -> a
+    327:334:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):605:612 -> a
+    335:335:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1126:1126 -> a
+    335:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):615 -> a
+    336:344:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:624 -> 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):623 -> a
-    346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):623:623 -> a
-    347:364:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):620:637 -> a
-    365:365:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1142:1142 -> a
-    365:365:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):637 -> a
-    366:366:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):638:638 -> a
+    345:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):624 -> a
+    346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):624:624 -> a
+    347:364:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):621:638 -> a
+    365:365:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1157:1157 -> a
+    365:365:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):638 -> a
+    366:366:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639:639 -> 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):638 -> a
+    367:378:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639 -> 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):638 -> a
+    379:379:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639 -> 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):638 -> a
+    380:388:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639 -> 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):638 -> a
+    389:389:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639 -> 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):638 -> a
+    390:394:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639 -> 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):638 -> a
+    395:395:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639 -> 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):638 -> a
+    396:396:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639 -> 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):638 -> a
+    397:399:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639 -> 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):638 -> a
-    402:406:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):641:645 -> a
-    407:407:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):650:650 -> a
-    408:408:void resolveAndBuildSwitch(int,int,int):837:837 -> a
-    409:409:void add(com.android.tools.r8.ir.code.Instruction):851:851 -> a
-    410:410:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    410:410:void add(com.android.tools.r8.ir.code.Instruction):852 -> a
-    411:411:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):884:884 -> a
-    412:412:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2190:2190 -> a
-    412:412:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):886 -> a
-    413:416:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):887:890 -> a
-    417:417:void addBooleanNonThisArgument(int):895:895 -> a
-    418:418:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2190:2190 -> a
-    418:418:void addBooleanNonThisArgument(int):897 -> a
-    419:422:void addBooleanNonThisArgument(int):898:901 -> a
-    423:424:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):906:907 -> a
-    425:425:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    425:425:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):909 -> a
-    426:426:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):910:910 -> a
-    427:430:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):919:922 -> a
-    431:431:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2190:2190 -> a
-    431:431:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):924 -> a
-    432:435:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):925:928 -> a
-    436:440:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):966:970 -> a
-    441:441:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():614:614 -> a
-    441:441:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):942 -> a
-    441:441:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):971 -> a
-    442:442:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):942:942 -> a
-    442:442:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):971 -> a
-    443:443:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):972:972 -> a
-    444:450:void addDebugPosition(com.android.tools.r8.ir.code.Position):977:983 -> a
-    451:451:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    451:451:void addDebugPosition(com.android.tools.r8.ir.code.Position):983 -> a
-    452:455:void addDebugPosition(com.android.tools.r8.ir.code.Position):985:988 -> a
-    456:456:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    456:456:void addDebugPosition(com.android.tools.r8.ir.code.Position):988 -> a
-    457:458:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1032:1033 -> 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):1034 -> 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):1034 -> 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):1034 -> 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):1034 -> 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):1034 -> 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):1034 -> a
-    502:505:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1035:1038 -> a
-    506:509:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):654:657 -> a
-    506:509:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1039 -> a
-    510:510:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1041:1041 -> a
-    511:515:void addArrayLength(int,int):1045:1049 -> a
-    516:522:void addCheckCast(int,com.android.tools.r8.graph.DexType):1064:1070 -> a
-    523:526:void addConst(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int,long):1083:1086 -> a
-    527:535:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1119:1127 -> a
-    536:540:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1126:1130 -> a
-    541:541:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1120:1120 -> a
-    542:550:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1134:1142 -> a
-    551:555:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1141:1145 -> a
-    556:556:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1135:1135 -> a
-    557:558:void addConstString(int,com.android.tools.r8.graph.DexString):1155:1156 -> a
-    559:559:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1149:1149 -> a
-    559:559:void addConstString(int,com.android.tools.r8.graph.DexString):1157 -> a
-    560:560:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    560:560:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1149 -> a
-    560:560:void addConstString(int,com.android.tools.r8.graph.DexString):1157 -> a
-    561:562:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1150:1151 -> a
-    561:562:void addConstString(int,com.android.tools.r8.graph.DexString):1157 -> a
-    563:563:void addConstString(int,com.android.tools.r8.graph.DexString):1158:1158 -> a
-    564:566:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1163:1165 -> a
-    567:567:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1149:1149 -> a
-    567:567:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1166 -> a
-    568:568:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    568:568:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1149 -> a
-    568:568:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1166 -> a
-    569:570:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1150:1151 -> a
-    569:570:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1166 -> a
-    571:572:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1167:1168 -> a
-    573:575:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1195:1197 -> a
-    576:577:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1206:1207 -> a
-    578:578:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2190:2190 -> a
-    578:578:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1209 -> a
-    579:581:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1210:1212 -> a
-    582:582:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    582:582:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1212 -> a
-    583:583:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1216:1216 -> a
-    584:590:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1313:1319 -> a
-    591:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1327:1327 -> a
-    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1340:1343 -> a
-    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1325 -> a
-    596:599:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1340:1343 -> a
-    600:604:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1348:1352 -> a
-    605:610:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1350:1355 -> a
-    611:611:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    611:611:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1356 -> a
-    612:615:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1360:1363 -> a
-    616:616:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    616:616:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1364 -> a
-    617:626:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1376:1385 -> a
-    627:647:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1379:1399 -> a
-    648:648:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    648:648:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1399 -> a
-    649:659:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1400:1410 -> a
-    660:664:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1420:1424 -> a
-    665:668: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):1423:1426 -> a
-    669:686:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1453:1470 -> a
-    687:691:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1475:1479 -> a
-    692:695:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1478:1481 -> a
-    696:719:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1492:1515 -> a
-    720:736:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1519:1535 -> a
-    737:761:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1556:1580 -> a
-    762:776:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1584:1598 -> a
-    777:777:boolean lambda$addMoveException$1(com.android.tools.r8.ir.code.BasicBlock):1611:1611 -> a
-    778:781:void addNewArrayFilledData(int,int,long,short[]):1683:1686 -> a
-    782:782:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    782:782:void addNewArrayFilledData(int,int,long,short[]):1687 -> a
-    783:783:void addReturn():1712:1712 -> a
-    784:786:void addReturn(com.android.tools.r8.ir.code.Return):1717:1719 -> a
-    784:786:void addReturn():1712 -> a
-    787:790:void addStaticGet(int,com.android.tools.r8.graph.DexField):1723:1726 -> a
-    791:796:void addStaticGet(int,com.android.tools.r8.graph.DexField):1724:1729 -> a
-    797:797:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    797:797:void addStaticGet(int,com.android.tools.r8.graph.DexField):1730 -> a
-    798:841:void addSwitch(int,int[],int,int[]):1762:1805 -> 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[]):1810 -> a
-    843:843:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    843:843:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    843:843:void addSwitch(int,int[],int,int[]):1811 -> a
-    844:848:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1818:1822 -> a
-    844:848:void addSwitch(int,int[],int,int[]):1812 -> a
-    849:849:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2422:2422 -> a
-    849:849:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1824 -> a
-    849:849:void addSwitch(int,int[],int,int[]):1812 -> a
-    850:873:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1825:1848 -> a
-    850:873:void addSwitch(int,int[],int,int[]):1812 -> a
-    874:874:void addSwitch(int,int[],int,int[]):1813:1813 -> a
-    875:876: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:2019 -> a
-    877: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):2034:2053 -> a
-    877: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):2022 -> a
-    897:897:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099:2099 -> 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):2058 -> 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):2022 -> a
-    898:898:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    898:898:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> 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):2058 -> 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):2022 -> a
-    899:899:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099:2099 -> 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):2058 -> 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):2022 -> a
-    900:900:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    900:900:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> 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):2058 -> 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):2022 -> a
-    901:901:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    901:901:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2101 -> 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):2058 -> 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):2022 -> a
-    902:902:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2102:2102 -> a
-    902:902: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):2058 -> a
-    902:902: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):2022 -> a
-    903:913:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():161:171 -> a
-    903:913:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2103 -> a
-    903: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):2058 -> a
-    903: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):2022 -> a
-    914:914:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():167:167 -> a
-    914:914:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2103 -> 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):2058 -> 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):2022 -> a
-    915:915:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():165:165 -> a
-    915:915:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2103 -> 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):2058 -> 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):2022 -> a
-    916:916:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():163:163 -> a
-    916:916:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2103 -> a
-    916:916: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):2058 -> a
-    916:916: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):2022 -> a
-    917:935:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2104:2122 -> a
-    917: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):2058 -> a
-    917: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):2022 -> a
-    936:936:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    936:936:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2101 -> a
-    936: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):2058 -> a
-    936: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):2022 -> a
-    937:939:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2090:2092 -> a
-    937:939: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):2060 -> a
-    937:939: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):2022 -> a
-    940:964: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):2061:2085 -> a
-    940:964: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):2022 -> a
-    965:965:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> a
-    965:965:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):993 -> a
-    966:966:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> a
-    966:966:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):994 -> a
-    967:967:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):995:995 -> a
-    968:968:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2182:2182 -> a
-    968:968:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):995 -> a
-    969:970:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):996:997 -> a
-    971:971:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    971:971:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):998 -> a
-    972:972:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> a
-    972:972:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1074 -> a
-    973:973:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> a
-    973:973:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1075 -> a
-    974:977:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1076:1079 -> a
-    978:978:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> a
-    978:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1974 -> a
-    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1975:1975 -> a
-    980:980:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2182:2182 -> a
-    980:980:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1975 -> a
-    981:982:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1976:1977 -> a
-    983:983:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    983:983:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1978 -> a
-    984:984:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> a
-    984:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> a
-    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1651:1651 -> a
-    986:986:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2182:2182 -> a
-    986:986:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1651 -> a
-    987:988:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1652:1653 -> a
-    989:989:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    989:989:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1654 -> a
-    990:993:com.android.tools.r8.ir.code.Value readIntLiteral(long):2147:2150 -> a
-    994:996: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):2157:2159 -> a
-    997:997:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2186:2186 -> a
-    997:997:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1984 -> a
-    998:1002:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1985:1989 -> a
-    1003:1003:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():614:614 -> a
-    1003:1003:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1989 -> a
-    1004:1014:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:2000 -> a
-    1015:1019:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1998:2002 -> a
-    1020:1020:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2186:2186 -> a
-    1020: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):2164 -> a
-    1021:1021:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2190:2190 -> a
-    1021:1021: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):2165 -> a
-    1022:1023: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):2177:2178 -> a
-    1024:1024:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2260:2260 -> a
-    1025:1027:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2292:2294 -> a
-    1025:1027:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2260 -> a
-    1028:1034:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2292:2298 -> a
-    1028:1034:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2260 -> a
-    1035:1035:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2295:2295 -> a
-    1035:1035:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2260 -> a
-    1036:1061:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2261:2286 -> a
-    1062:1066:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2275:2279 -> a
-    1067:1073:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2277:2283 -> a
-    1074:1074:boolean isOffsetProcessed(int):2361:2361 -> a
-    1074:1074:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2354 -> a
-    1074:1074:void ensureSuccessorBlock(int,int,boolean):2390 -> a
-    1075:1077:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2355:2357 -> a
-    1075:1077:void ensureSuccessorBlock(int,int,boolean):2390 -> a
-    1078:1081:int getBlockStartOffset(int):2345:2348 -> a
-    1078:1081:void ensureSuccessorBlock(int,int,boolean):2391 -> a
-    1082:1082:void ensureSuccessorBlock(int,int,boolean):2392:2392 -> a
-    1083:1083:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):280:280 -> a
-    1083:1083:void ensureSuccessorBlock(int,int,boolean):2394 -> a
-    1084:1084:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):276:276 -> a
-    1084:1084:void ensureSuccessorBlock(int,int,boolean):2395 -> a
-    1085:1085:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):293:293 -> a
-    1085:1085:void ensureSuccessorBlock(int,int,boolean):2397 -> a
-    1086:1086:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> a
-    1086:1086:void ensureSuccessorBlock(int,int,boolean):2398 -> a
-    1087:1087:void ensureSuccessorBlock(int,int,boolean):2400:2400 -> a
-    1088:1088:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2422:2422 -> a
-    1088:1088:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1284 -> a
-    1089:1089:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2422:2422 -> a
-    1089:1089:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1285 -> a
-    1090:1095:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1286:1291 -> a
-    1096:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439:2442 -> a
-    1100:1100:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2441:2441 -> a
-    1101:1103:void generateSplitEdgeBlocks():2456:2458 -> a
-    1101:1103:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1104:1104:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2426:2426 -> a
-    1104:1104:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2418 -> a
-    1104:1104:void generateSplitEdgeBlocks():2458 -> a
-    1104:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1105:1105:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2414:2414 -> a
-    1105:1105:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2418 -> a
-    1105:1105:void generateSplitEdgeBlocks():2458 -> a
-    1105:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1106:1106:void generateSplitEdgeBlocks():2459:2459 -> a
-    1106:1106:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1107:1108:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():308:309 -> a
-    1107:1108:void generateSplitEdgeBlocks():2460 -> a
-    1107:1108:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1109:1109:void generateSplitEdgeBlocks():2463:2463 -> a
-    1109:1109:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1110:1110:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2414:2414 -> a
-    1110:1110:void generateSplitEdgeBlocks():2464 -> a
-    1110:1110:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1111:1111:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
-    1111:1111:void generateSplitEdgeBlocks():2465 -> a
-    1111:1111:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1112:1122:void generateSplitEdgeBlocks():2468:2478 -> a
-    1112:1122:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1123:1131:void generateSplitEdgeBlocks():2475:2483 -> a
-    1123:1131:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1132:1137:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2499:2504 -> a
-    1132:1137:void generateSplitEdgeBlocks():2483 -> a
-    1132:1137:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1138:1148:void generateSplitEdgeBlocks():2484:2494 -> a
-    1138:1148:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1149:1151:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:303 -> a
-    1149:1151:void generateSplitEdgeBlocks():2494 -> a
-    1149:1151:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1152:1152:void generateSplitEdgeBlocks():2494:2494 -> a
-    1152:1152:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2443 -> a
-    1153:1153:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> a
-    1153:1153:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2444 -> a
-    1154:1154:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2445:2445 -> a
-    1155:1155:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2593:2593 -> a
+    400:401:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):639 -> a
+    402:406:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):642:646 -> a
+    407:407:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):651:651 -> a
+    408:408:void resolveAndBuildSwitch(int,int,int):838:838 -> a
+    409:409:void add(com.android.tools.r8.ir.code.Instruction):852:852 -> 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):853 -> a
+    411:412:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):885:886 -> a
+    413:413:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    413:413:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):888 -> a
+    414:414:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):889:889 -> a
+    415:418:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):898:901 -> a
+    415:418:void addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):893 -> a
+    419:419:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
+    419:419:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):903 -> a
+    419:419:void addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):893 -> a
+    420:423:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):904:907 -> a
+    420:423:void addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):893 -> a
+    424:428:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):945:949 -> a
+    429:429:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():615:615 -> a
+    429:429:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):921 -> a
+    429:429:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):950 -> a
+    430:430:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):921:921 -> a
+    430:430:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):950 -> a
+    431:431:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):951:951 -> a
+    432:438:void addDebugPosition(com.android.tools.r8.ir.code.Position):956:962 -> a
+    439:439:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    439:439:void addDebugPosition(com.android.tools.r8.ir.code.Position):962 -> a
+    440:444:void addDebugPosition(com.android.tools.r8.ir.code.Position):969:973 -> a
+    445:445:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    445:445:void addDebugPosition(com.android.tools.r8.ir.code.Position):973 -> a
+    446:447:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1017:1018 -> a
+    448:468:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):151:171 -> a
+    448:468:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1019 -> a
+    469:469:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):166:166 -> a
+    469:469:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1019 -> a
+    470:474:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):160:164 -> a
+    470:474:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1019 -> a
+    475:475:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):162:162 -> a
+    475:475:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1019 -> a
+    476:476:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):158:158 -> a
+    476:476:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1019 -> a
+    477:490:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):156:169 -> a
+    477:490:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1019 -> a
+    491:494:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1020:1023 -> a
+    495:498:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):655:658 -> a
+    495:498:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1024 -> a
+    499:499:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026:1026 -> a
+    500:504:void addArrayLength(int,int):1030:1034 -> a
+    505:511:void addCheckCast(int,com.android.tools.r8.graph.DexType):1049:1055 -> a
+    512:515:void addConst(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int,long):1068:1071 -> a
+    516:524:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1104:1112 -> a
+    525:529:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1111:1115 -> a
+    530:530:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1105:1105 -> a
+    531:539:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1119:1127 -> a
+    540:544:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1126:1130 -> a
+    545:545:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1120:1120 -> a
+    546:547:void addConstString(int,com.android.tools.r8.graph.DexString):1140:1141 -> a
+    548:548:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1134:1134 -> a
+    548:548:void addConstString(int,com.android.tools.r8.graph.DexString):1142 -> a
+    549:549:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    549:549:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1134 -> a
+    549:549:void addConstString(int,com.android.tools.r8.graph.DexString):1142 -> a
+    550:551:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1135:1136 -> a
+    550:551:void addConstString(int,com.android.tools.r8.graph.DexString):1142 -> a
+    552:552:void addConstString(int,com.android.tools.r8.graph.DexString):1143:1143 -> a
+    553:554:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1148:1149 -> a
+    555:555:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1134:1134 -> a
+    555:555:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1150 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1134 -> a
+    556:556:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1150 -> a
+    557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1135:1136 -> a
+    557:558:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1150 -> a
+    559:560:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1151:1152 -> a
+    561:563:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1179:1181 -> a
+    564:565:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1190:1191 -> a
+    566:566:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
+    566:566:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1193 -> a
+    567:569:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1194:1196 -> a
+    570:570:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    570:570:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1196 -> a
+    571:572:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1201:1202 -> a
+    573:573:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    573:573:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1202 -> a
+    574:574:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1205:1205 -> a
+    575:576:void addNop():1231:1232 -> a
+    577:577:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    577:577:void addNop():1232 -> a
+    578:584:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1311:1317 -> a
+    585:585:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1325:1325 -> a
+    586:589:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1338:1341 -> a
+    586:589:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1323 -> a
+    590:593:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1338:1341 -> a
+    594:598:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1346:1350 -> a
+    599:604:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1348:1353 -> a
+    605:605:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    605:605:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1354 -> a
+    606:609:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1358:1361 -> a
+    610:610:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    610:610:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1362 -> a
+    611:620: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):1374:1383 -> a
+    621:641: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):1377:1397 -> a
+    642:642:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    642:642: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):1397 -> a
+    643:653: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):1398:1408 -> a
+    654: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,java.util.List,boolean):1418:1422 -> a
+    659: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):1421:1424 -> a
+    663:680:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1451:1468 -> a
+    681:685:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1473:1477 -> a
+    686:689:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1476:1479 -> a
+    690:713:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1490:1513 -> a
+    714:730:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1517:1533 -> a
+    731:755:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1554:1578 -> a
+    756:770:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1582:1596 -> a
+    771:771:boolean lambda$addMoveException$1(com.android.tools.r8.ir.code.BasicBlock):1609:1609 -> a
+    772:775:void addNewArrayFilledData(int,int,long,short[]):1681:1684 -> a
+    776:776:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    776:776:void addNewArrayFilledData(int,int,long,short[]):1685 -> a
+    777:780:void addStaticGet(int,com.android.tools.r8.graph.DexField):1721:1724 -> a
+    781:786:void addStaticGet(int,com.android.tools.r8.graph.DexField):1722:1727 -> a
+    787:787:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    787:787:void addStaticGet(int,com.android.tools.r8.graph.DexField):1728 -> a
+    788:831:void addSwitch(int,int[],int,int[]):1760:1803 -> a
+    832:832:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    832:832:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    832:832:void addSwitch(int,int[],int,int[]):1808 -> a
+    833:833:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    833:833:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    833:833:void addSwitch(int,int[],int,int[]):1809 -> a
+    834:838:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1816:1820 -> a
+    834:838:void addSwitch(int,int[],int,int[]):1810 -> a
+    839:839:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
+    839:839:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1822 -> a
+    839:839:void addSwitch(int,int[],int,int[]):1810 -> a
+    840:863:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1823:1846 -> a
+    840:863:void addSwitch(int,int[],int,int[]):1810 -> a
+    864:864:void addSwitch(int,int[],int,int[]):1811:1811 -> a
+    865:866: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):2016:2017 -> a
+    867:886: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):2032:2051 -> a
+    867:886: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):2020 -> a
+    887:887:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097:2097 -> a
+    887:887: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
+    887:887: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):2020 -> a
+    888:888:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
+    888:888:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097 -> a
+    888:888: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
+    888:888: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):2020 -> a
+    889:889:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097:2097 -> a
+    889:889: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
+    889:889: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):2020 -> a
+    890:890:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
+    890:890:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097 -> a
+    890:890: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
+    890:890: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):2020 -> a
+    891:891:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
+    891:891:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
+    891:891: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
+    891:891: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):2020 -> a
+    892:892:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099:2099 -> a
+    892: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):2056 -> a
+    892: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):2020 -> a
+    893:903:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():161:171 -> a
+    893:903:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
+    893:903: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
+    893:903: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):2020 -> a
+    904:904:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():167:167 -> a
+    904:904:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
+    904:904: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
+    904:904: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):2020 -> a
+    905:905:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():165:165 -> a
+    905:905:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
+    905:905: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
+    905:905: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):2020 -> a
+    906:906:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():163:163 -> a
+    906:906:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
+    906:906: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
+    906:906: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):2020 -> a
+    907:925:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2100:2118 -> a
+    907:925: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
+    907:925: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):2020 -> a
+    926:926:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
+    926:926:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
+    926:926: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
+    926:926: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):2020 -> a
+    927:929:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2088:2090 -> a
+    927:929: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):2058 -> a
+    927:929: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):2020 -> a
+    930:954: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):2059:2083 -> a
+    930:954: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):2020 -> a
+    955:955:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
+    955:955:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):978 -> a
+    956:956:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
+    956:956:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):979 -> a
+    957:957:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):980:980 -> a
+    958:958: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
+    958:958:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):980 -> a
+    959:960:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):981:982 -> a
+    961:961:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    961:961:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):983 -> 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 addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1059 -> 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 addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1060 -> a
+    964:967:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1061:1064 -> a
+    968:968:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
+    968:968:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1972 -> a
+    969:969:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1973:1973 -> a
+    970:970: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
+    970:970:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1973 -> a
+    971:972:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1974:1975 -> a
+    973:973:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    973:973:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1976 -> a
+    974:974:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
+    974:974:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1648 -> a
+    975:975:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1649:1649 -> 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):2178:2178 -> a
+    976:976:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1649 -> a
+    977:978:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1650:1651 -> a
+    979:979:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
+    979:979:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1652 -> a
+    980:983:com.android.tools.r8.ir.code.Value readIntLiteral(long):2143:2146 -> a
+    984:986: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
+    987:987:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2182:2182 -> a
+    987:987:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982 -> a
+    988:992:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1983:1987 -> a
+    993:993:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():615:615 -> a
+    993:993:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1987 -> a
+    994:1004:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1988:1998 -> a
+    1005:1009:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1996:2000 -> a
+    1010:1010:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2182:2182 -> a
+    1010:1010: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
+    1011:1011:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
+    1011:1011: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
+    1012:1013: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
+    1014:1014:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
+    1014:1014:void addBooleanNonThisArgument(int):879 -> a
+    1015:1016:void addBooleanNonThisArgument(int):880:881 -> a
+    1017:1017:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
+    1017:1017:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):873 -> a
+    1018:1019:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):874:875 -> a
+    1020:1020:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256:2256 -> a
+    1021:1024:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2288:2288 -> a
+    1021:1024:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
+    1027:1031:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2291:2291 -> a
+    1027: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
+    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
+    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
+    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
+    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):1282 -> 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):1283 -> a
+    1086:1091:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1284:1289 -> 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
+    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
+    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
+    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:20:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):63:82 -> b
-    1:20:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1053 -> b
+    1:20:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1038 -> b
     21:21:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):78:78 -> b
-    21:21:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1053 -> b
+    21:21:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1038 -> b
     22:26:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):72:76 -> b
-    22:26:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1053 -> b
+    22:26:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1038 -> b
     27:27:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):74:74 -> b
-    27:27:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1053 -> b
+    27:27:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1038 -> b
     28:28:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):70:70 -> b
-    28:28:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1053 -> b
+    28:28:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1038 -> b
     29:41:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):68:80 -> b
-    29:41:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1053 -> b
-    42:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1053:1057 -> b
-    47:50:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):654:657 -> b
-    47:50:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1058 -> b
-    51:51:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1060:1060 -> b
-    52:52:void addConstantOrUnusedArgument(int):914:914 -> b
-    53:66:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):946:959 -> b
-    67:69:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):958:960 -> b
-    70:70:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> b
-    70:70:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):961 -> b
-    71:71:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1002:1002 -> b
-    72:72:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> b
-    72:72:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1003 -> b
-    73:74:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1004:1005 -> b
-    75:75:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2182:2182 -> b
-    75:75:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1005 -> b
-    76:77:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1006:1007 -> b
-    78:78:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> b
-    78:78:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1008 -> b
-    79:84:void addConstClass(int,com.android.tools.r8.graph.DexType):1110:1115 -> b
-    85:85:void addTrivialIf(int,int):1270:1270 -> b
-    86:86:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2422:2422 -> b
-    86:86:void addTrivialIf(int,int):1274 -> b
-    87:90:void addTrivialIf(int,int):1277:1280 -> b
-    91:94:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1368:1371 -> b
-    95:95:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1539:1539 -> b
-    96:96:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> b
-    96:96:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1539 -> b
-    97:103:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1539:1545 -> b
-    104:110:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1672:1678 -> b
-    111:111:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> b
-    111:111:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1679 -> b
-    112:115:void addStaticPut(int,com.android.tools.r8.graph.DexField):1734:1737 -> b
-    116:116:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> b
-    116:116:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1658 -> b
-    117:117:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1659:1659 -> b
-    118:118:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2182:2182 -> b
-    118:118:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1659 -> b
-    119:122:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1661:1664 -> b
-    123:126:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2131:2134 -> b
-    123:126:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1664 -> b
-    127:130:com.android.tools.r8.ir.code.Value readLongLiteral(long):2140:2143 -> b
-    127:130:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2135 -> b
-    127:130:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1664 -> b
-    131:133:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1665:1667 -> b
-    134:134:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> b
-    134:134:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1668 -> b
-    135:135:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> b
-    136:137:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2430:2431 -> b
-    138:138:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):502:502 -> b
-    138:138:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2432 -> b
-    139:141:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2433:2435 -> b
-    142:142:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2597:2597 -> b
-    1:3:void flushArgumentInstructions():933:935 -> c
-    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1012:1012 -> c
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> c
-    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1013 -> c
-    6:6:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> c
-    6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1014 -> c
-    7:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1015:1015 -> c
-    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):2182:2182 -> c
-    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1015 -> c
-    9:10:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1016:1017 -> c
-    11:11:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> c
-    11:11:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1018 -> c
-    12:12:void checkInvokeArgumentRegisters(int,int):1603:1603 -> c
-    13:13:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    13:13:void checkInvokeArgumentRegisters(int,int):1603 -> c
-    14:14:void checkInvokeArgumentRegisters(int,int):1603:1603 -> c
-    15:18:void addNewInstance(int,com.android.tools.r8.graph.DexType):1692:1695 -> c
-    19:19:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> c
-    19:19:void addNewInstance(int,com.android.tools.r8.graph.DexType):1696 -> c
-    20:22:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2007:2009 -> c
-    23:40:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2303:2320 -> c
-    41:41:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2422:2422 -> c
-    41:41:void addGoto(int):1262 -> c
-    42:45:void addGoto(int):1263:1266 -> c
-    1:2:java.util.List getArgumentValues():486:487 -> d
-    3:3:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):580:580 -> d
-    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1022:1022 -> d
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> d
-    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1023 -> d
-    6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1024:1025 -> 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):2182:2182 -> d
-    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1025 -> d
-    9:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1026:1027 -> d
-    11:11:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> d
-    11:11:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1028 -> d
-    12:17:void addMoveException(int):1610:1615 -> d
-    18:23:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1619:1624 -> d
-    18:23:void addMoveException(int):1615 -> d
-    24:24:void ensureExceptionalSuccessorBlock(int,int):2408:2408 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():482:482 -> e
-    2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1172:1172 -> e
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> e
-    3:3:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1173 -> e
-    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> e
-    4:4:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1174 -> e
-    5:5:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1176:1176 -> 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):2182:2182 -> e
-    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1175 -> e
-    7:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1177:1179 -> e
-    10:18:void addMoveResult(int):1630:1638 -> e
-    19:28:void addMoveResult(int):1637:1646 -> e
-    29:29:void ensureNormalSuccessorBlock(int,int):2404:2404 -> e
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():474:474 -> f
-    2:2:void resolveAndBuildNewArrayFilledData(int,int):842:842 -> f
-    3:3:void addNullConst(int):1106:1106 -> f
-    4:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1183:1184 -> f
-    6:6:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> f
-    6:6:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1185 -> f
-    7:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1186:1188 -> f
-    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):2182:2182 -> f
-    10:10:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1187 -> f
-    11:13:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1189:1191 -> f
-    1:1:com.android.tools.r8.ir.code.Value getReceiverValue():491:491 -> g
-    2:9:void addReturn(int):1700:1707 -> g
-    10:12:void addReturn(com.android.tools.r8.ir.code.Return):1717:1719 -> g
-    10:12:void addReturn(int):1707 -> g
-    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> g
-    13:13:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1220 -> g
-    14:14:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> g
-    14:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1221 -> g
-    15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1222:1222 -> g
-    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):2182:2182 -> g
-    16:16:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1222 -> g
-    17:18:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1223:1224 -> g
-    19:19:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> g
-    19:19:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1225 -> g
-    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo getRemovedArgumentInfo():856:861 -> h
-    7:10:void addThisArgument(int):866:869 -> h
-    11:12:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):874:875 -> h
-    11:12:void addThisArgument(int):870 -> h
-    13:13:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2190:2190 -> h
-    13:13:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):876 -> h
-    13:13:void addThisArgument(int):870 -> h
-    14:15:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):877:878 -> h
-    14:15:void addThisArgument(int):870 -> h
-    16:16:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> h
-    16:16:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):878 -> h
-    16:16:void addThisArgument(int):870 -> h
-    17:18:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):879:880 -> h
-    17:18:void addThisArgument(int):870 -> h
-    19:19:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1229:1229 -> h
-    20:20:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> h
-    20:20:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1230 -> h
-    21:22:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1231:1232 -> h
-    23:23:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2182:2182 -> h
-    23:23:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1232 -> h
-    24:25:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1233:1234 -> h
-    26:26:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> h
-    26:26:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1235 -> h
-    1:1:boolean isDebugMode():478:478 -> i
-    2:6:void addThrow(int):1852:1856 -> i
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> i
-    7:7:void addThrow(int):1856 -> i
-    8:8:void addThrow(int):1857:1857 -> i
-    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1861:1861 -> i
-    10:10:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> i
-    10:10:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1862 -> i
-    11:11:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> i
-    11:11:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1863 -> i
-    12:12:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1864:1864 -> i
-    13:13:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2182:2182 -> i
-    13:13:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1864 -> i
-    14:15:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1865:1866 -> i
-    16:16:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> i
-    16:16:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1867 -> i
-    1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1871:1871 -> j
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> j
-    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1872 -> j
-    3:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1873:1874 -> 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):2182:2182 -> j
-    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1874 -> j
-    6:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1875:1876 -> j
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> j
-    8:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1877 -> j
-    9:10:void checkRegister(int):2197:2198 -> j
-    11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> j
-    11:11:void checkRegister(int):2198 -> j
-    12:12:void checkRegister(int):2198:2198 -> j
-    13:13:void checkRegister(int):2195:2195 -> j
-    1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1239:1239 -> k
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> k
-    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1240 -> k
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> k
-    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1241 -> k
-    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1243:1243 -> 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):2182:2182 -> k
-    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1242 -> k
-    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1244:1245 -> k
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> k
-    8:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1246 -> k
-    9:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2327:2328 -> k
-    11:11:boolean isOffsetProcessed(int):2361:2361 -> k
-    11:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2331 -> k
-    12:15:int getBlockStartOffset(int):2345:2348 -> k
-    12:15:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2332 -> k
-    16:17:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2333:2334 -> k
-    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 -> k
-    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    20:21:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> k
-    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 -> k
-    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    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 -> k
-    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    28:29:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):284:285 -> k
-    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 -> k
-    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    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 -> k
-    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    32:33:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> k
-    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 -> k
-    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    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 -> k
-    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    39:39:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> k
-    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 -> k
-    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    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 -> k
-    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    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 -> k
-    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 -> k
-    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    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 -> k
-    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    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 -> k
-    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2334 -> k
-    45:48:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2336:2339 -> k
-    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1250:1251 -> l
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> l
-    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1252 -> l
-    4:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1253:1255 -> 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):2182:2182 -> l
-    7:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1254 -> l
-    8:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1256:1257 -> l
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> l
-    10:10:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1258 -> l
-    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2422:2422 -> l
-    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1750:1750 -> m
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> m
-    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1751 -> m
-    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1752:1753 -> 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):2182:2182 -> m
-    5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1753 -> m
-    6:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1756:1757 -> m
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> m
-    8:8:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1758 -> m
-    9:10:boolean isIndexProcessed(int):2365:2366 -> m
-    11:12:void ensureSubroutineProcessedInstructions():2383:2384 -> m
-    11:12:boolean isIndexProcessed(int):2368 -> m
-    13:13:boolean isIndexProcessed(int):2369:2369 -> m
-    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1881:1881 -> n
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> n
-    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1882 -> n
-    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1883:1884 -> 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):2182:2182 -> n
-    5:5:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1884 -> n
-    6:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1885:1886 -> n
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> n
-    8:8:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1887 -> n
-    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1891:1891 -> o
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> o
-    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1892 -> o
-    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1893:1894 -> 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):2182:2182 -> o
-    5:5:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1894 -> o
-    6:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1895:1896 -> o
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> o
-    8:8:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1897 -> o
-    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1901:1901 -> p
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> p
-    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1902 -> p
-    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1903:1904 -> 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):2182:2182 -> p
-    5:5:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1904 -> p
-    6:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1905:1906 -> p
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> p
-    8:8:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1907 -> p
-    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1911:1911 -> q
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> q
-    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1912 -> q
-    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1913:1914 -> 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):2182:2182 -> q
-    5:5:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1914 -> q
-    6:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1915:1916 -> q
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> q
-    8:8:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1917 -> q
-    1:1:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> r
-    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1741 -> r
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> r
-    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1742 -> r
-    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1743:1743 -> 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):2182:2182 -> r
-    4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1743 -> r
-    5:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1744:1745 -> r
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> r
-    7:7:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1746 -> r
-    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1921:1921 -> s
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> s
-    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1922 -> s
-    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1923:1924 -> 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):2182:2182 -> s
-    5:5:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1924 -> s
-    6:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1925:1926 -> s
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> s
-    8:8:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1927 -> s
-    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1931:1931 -> t
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> t
-    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1932 -> t
-    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1933:1934 -> 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):2182:2182 -> t
-    5:5:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1934 -> t
-    6:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1935:1936 -> t
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> t
-    8:8:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1937 -> t
-    1:7:java.lang.String toString():2606:2612 -> toString
-    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1941:1941 -> u
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> u
-    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1942 -> u
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> u
-    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1943 -> u
-    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1944:1944 -> 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):2182:2182 -> u
-    5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1944 -> u
-    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1946:1953 -> u
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> u
-    14:14:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1954 -> u
-    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1958:1958 -> v
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2127:2127 -> v
-    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1959 -> v
-    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1961:1962 -> 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):2182:2182 -> v
-    5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1962 -> v
-    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1963:1966 -> 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):2182:2182 -> v
-    10:10:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1966 -> v
-    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1967:1969 -> v
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2256:2256 -> v
-    14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1970 -> v
+    29:41:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1038 -> b
+    42:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1038:1042 -> b
+    47:50:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):655:658 -> b
+    47:50:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1043 -> b
+    51:51:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1045:1045 -> b
+    52:65:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):925:938 -> b
+    66:68:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):937:939 -> b
+    69:69:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
+    69:69:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):940 -> b
+    70:70:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):987:987 -> b
+    71:71:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> b
+    71:71:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):988 -> b
+    72:73:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):989:990 -> b
+    74:74: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
+    74:74:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> b
+    75:76:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):991:992 -> b
+    77:77:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
+    77:77:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):993 -> b
+    78:83:void addConstClass(int,com.android.tools.r8.graph.DexType):1095:1100 -> b
+    84:84:void addTrivialIf(int,int):1268:1268 -> b
+    85:85:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> b
+    85:85:void addTrivialIf(int,int):1272 -> b
+    86:89:void addTrivialIf(int,int):1275:1278 -> b
+    90:93:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1366:1369 -> b
+    94:94:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1537:1537 -> b
+    95:95:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> b
+    95:95:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1537 -> b
+    96:102:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1537:1543 -> b
+    103:109:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1670:1676 -> b
+    110:110:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
+    110:110:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1677 -> b
+    111:111:void addReturn():1710:1710 -> b
+    112:114:void addReturn(com.android.tools.r8.ir.code.Return):1715:1717 -> b
+    112:114:void addReturn():1710 -> b
+    115:118:void addStaticPut(int,com.android.tools.r8.graph.DexField):1732:1735 -> b
+    119:119:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> b
+    119:119:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    120:120:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1657 -> b
+    121:121: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
+    121:121:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657 -> b
+    122:125:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1659:1662 -> b
+    126:129:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127:2130 -> b
+    126:129:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1662 -> b
+    130:133:com.android.tools.r8.ir.code.Value readLongLiteral(long):2136:2139 -> b
+    130:133:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2131 -> b
+    130:133:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1662 -> b
+    134:136:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1663:1665 -> b
+    137:137:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
+    137:137:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1666 -> b
+    138:138:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
+    139:139:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> b
+    139:139:void addGoto(int):1260 -> b
+    140:143:void addGoto(int):1261:1264 -> b
+    144:144:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2593:2593 -> b
+    1:1:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):997:997 -> c
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> c
+    2:2:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):998 -> c
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> c
+    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):999 -> c
+    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1000:1000 -> c
+    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 -> c
+    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1000 -> c
+    6:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1001:1002 -> c
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> c
+    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1003 -> c
+    9:9:void checkInvokeArgumentRegisters(int,int):1601:1601 -> c
+    10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
+    10:10:void checkInvokeArgumentRegisters(int,int):1601 -> c
+    11:11:void checkInvokeArgumentRegisters(int,int):1601:1601 -> c
+    12:17:void addMoveException(int):1608:1613 -> c
+    18:23:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1617:1622 -> c
+    18:23:void addMoveException(int):1613 -> c
+    24:27:void addNewInstance(int,com.android.tools.r8.graph.DexType):1690:1693 -> c
+    28:28:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> c
+    28:28:void addNewInstance(int,com.android.tools.r8.graph.DexType):1694 -> c
+    29:31:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2005:2007 -> c
+    32:49:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2299:2316 -> c
+    50:51:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2426:2427 -> c
+    52:52:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):503:503 -> c
+    52:52:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2428 -> c
+    53:55:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2429:2431 -> c
+    1:1:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):581:581 -> d
+    2:4:void flushArgumentInstructions():912:914 -> d
+    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1007:1007 -> d
+    6:6:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> d
+    6:6:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1008 -> d
+    7:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1009:1010 -> d
+    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 -> d
+    9:9:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> d
+    10:11:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1011:1012 -> d
+    12:12:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> d
+    12:12:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1013 -> d
+    13:21:void addMoveResult(int):1628:1636 -> d
+    22:31:void addMoveResult(int):1635:1644 -> d
+    32:32:void ensureExceptionalSuccessorBlock(int,int):2404:2404 -> d
+    1:2:java.util.List getArgumentValues():487:488 -> e
+    3:3:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1156:1156 -> 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):1157 -> e
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> e
+    5:5:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1158 -> e
+    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1160:1160 -> e
+    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 -> e
+    7:7:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1159 -> e
+    8:10:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1161:1163 -> e
+    11:18:void addReturn(int):1698:1705 -> e
+    19:21:void addReturn(com.android.tools.r8.ir.code.Return):1715:1717 -> e
+    19:21:void addReturn(int):1705 -> e
+    22:22:void ensureNormalSuccessorBlock(int,int):2400:2400 -> e
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():483:483 -> f
+    2:2:void resolveAndBuildNewArrayFilledData(int,int):843:843 -> f
+    3:6:void addThisArgument(int):857:860 -> f
+    7:7:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> f
+    7:7:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):865 -> f
+    7:7:void addThisArgument(int):861 -> f
+    8:9:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):866:867 -> f
+    8:9:void addThisArgument(int):861 -> f
+    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> f
+    10:10:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):867 -> f
+    10:10:void addThisArgument(int):861 -> f
+    11:12:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):868:869 -> f
+    11:12:void addThisArgument(int):861 -> f
+    13:14:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1167:1168 -> f
+    15:15:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> f
+    15:15:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1169 -> f
+    16:18:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1170:1172 -> f
+    19:19: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
+    19:19:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1171 -> f
+    20:22:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1173:1175 -> f
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():471:471 -> g
+    2:6:void addThrow(int):1850:1854 -> g
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> g
+    7:7:void addThrow(int):1854 -> g
+    8:8:void addThrow(int):1855:1855 -> g
+    9:9:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> g
+    9:9:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1209 -> g
+    10:10:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> g
+    10:10:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1210 -> g
+    11:11:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1211:1211 -> g
+    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 -> g
+    12:12:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1211 -> g
+    13:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1212:1213 -> g
+    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> g
+    15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214 -> g
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():475:475 -> h
+    2:2:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1218:1218 -> h
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> h
+    3:3:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1219 -> h
+    4:5:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1220:1221 -> h
+    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 -> h
+    6:6:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1221 -> h
+    7:8:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1222:1223 -> h
+    9:9:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> h
+    9:9:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1224 -> h
+    10:11:void checkRegister(int):2193:2194 -> h
+    12:12:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> h
+    12:12:void checkRegister(int):2194 -> h
+    13:13:void checkRegister(int):2194:2194 -> h
+    14:14:void checkRegister(int):2191:2191 -> h
+    1:1:com.android.tools.r8.ir.code.Value getReceiverValue():492:492 -> i
+    2:2:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859:1859 -> i
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> i
+    3:3:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1860 -> i
+    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> i
+    4:4:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1861 -> i
+    5:5:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1862:1862 -> i
+    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 -> i
+    6:6:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1862 -> i
+    7:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1863:1864 -> i
+    9:9:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> i
+    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1865 -> i
+    10:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323:2324 -> i
+    12:12:boolean isOffsetProcessed(int):2357:2357 -> i
+    12:12:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2327 -> i
+    13:16:int getBlockStartOffset(int):2341:2344 -> i
+    13:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328 -> i
+    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2329:2330 -> i
+    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):314:315 -> i
+    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    21:22:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> i
+    21:22: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 -> i
+    21:22:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    23: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):315:320 -> i
+    23:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    29:30:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):284:285 -> i
+    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):321 -> i
+    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    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):323:324 -> i
+    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    33:34:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> i
+    33:34: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 -> i
+    33:34:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    35: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):324:328 -> i
+    35:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    40:40:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> i
+    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):329 -> i
+    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    41: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:331 -> i
+    41:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    42:43:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> i
+    42: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 -> i
+    42:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    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):331:331 -> i
+    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    45:45: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 -> i
+    45:45:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> i
+    46:49:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2332:2335 -> i
+    1:1:boolean isDebugMode():479:479 -> j
+    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869:1869 -> j
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> j
+    3:3:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1870 -> j
+    4:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1871:1872 -> j
+    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 -> j
+    6:6:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1872 -> j
+    7:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1873:1874 -> j
+    9:9:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> j
+    9:9:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1875 -> j
+    10:10:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> j
+    1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1237:1237 -> 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):1238 -> 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):1239 -> k
+    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1241:1241 -> 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):1240 -> k
+    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1242:1243 -> 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):1244 -> k
+    9:10:boolean isIndexProcessed(int):2361:2362 -> k
+    11:12:void ensureSubroutineProcessedInstructions():2379:2380 -> k
+    11:12:boolean isIndexProcessed(int):2364 -> k
+    13:13:boolean isIndexProcessed(int):2365:2365 -> k
+    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1248:1249 -> 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):1250 -> l
+    4:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1251:1253 -> 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):1252 -> l
+    8:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1254:1255 -> 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):1256 -> l
+    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1748 -> 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):1749 -> m
+    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1750:1751 -> 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):1751 -> m
+    6:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1754:1755 -> 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):1756 -> m
+    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1879:1879 -> 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):1880 -> n
+    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1881:1882 -> 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):1882 -> n
+    6:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1883:1884 -> 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):1885 -> n
+    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1889:1889 -> 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):1890 -> o
+    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1891:1892 -> 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):1892 -> o
+    6:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1893:1894 -> 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):1895 -> o
+    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1899:1899 -> 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):1900 -> p
+    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1901:1902 -> 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):1902 -> p
+    6:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1903:1904 -> 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):1905 -> p
+    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1909:1909 -> 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):1910 -> q
+    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1911:1912 -> 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):1912 -> q
+    6:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1913:1914 -> 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):1915 -> 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):1739 -> 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):1740 -> r
+    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1741:1741 -> 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):1741 -> r
+    5:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1742:1743 -> 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):1744 -> r
+    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1919:1919 -> 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):1920 -> s
+    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1921:1922 -> 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):1922 -> s
+    6:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1923:1924 -> 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):1925 -> s
+    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1929:1929 -> 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):1930 -> t
+    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1931:1932 -> 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):1932 -> t
+    6:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1933:1934 -> 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):1935 -> t
+    1:7:java.lang.String toString():2602:2608 -> toString
+    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1939:1939 -> 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):1940 -> 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):1941 -> u
+    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1942:1942 -> 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):1942 -> u
+    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1944:1951 -> 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):1952 -> u
+    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1956:1956 -> 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):1957 -> v
+    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1959:1960 -> 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):1960 -> v
+    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1961:1964 -> 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):1964 -> v
+    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1965:1967 -> 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):1968 -> v
 com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.ir.conversion.N$a:
 com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.ir.conversion.N$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
@@ -28209,335 +28204,319 @@
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.ir.conversion.O:
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> C
-    java.util.List onWaveDoneActions -> Q
+    com.android.tools.r8.graph.DexString highestSortingString -> Q
+    com.android.tools.r8.ir.optimize.EnumUnboxer enumUnboxer -> I
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> F
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> A
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> O
     com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> x
-    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> J
+    java.util.List neverMergePrefixes -> S
     com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> H
-    java.util.Collection assumers -> I
+    boolean $assertionsDisabled -> V
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> n
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> r
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> g
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> l
-    boolean seenNeverMergePrefix -> T
+    boolean seenNotNeverMergePrefix -> T
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> q
     com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> B
+    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> M
     com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> o
-    com.android.tools.r8.ir.optimize.AssertionsRewriter assertionsRewriter -> K
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> O
     com.android.tools.r8.utils.Timing timing -> b
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> N
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> y
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> i
-    com.android.tools.r8.graph.DexString highestSortingString -> P
-    java.util.List neverMergePrefixes -> R
+    java.util.List onWaveDoneActions -> R
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> E
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> N
-    boolean $assertionsDisabled -> U
+    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> K
     com.android.tools.r8.utils.CfgPrinter printer -> u
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> w
+    boolean seenNeverMergePrefix -> U
     com.android.tools.r8.ir.optimize.Outliner outliner -> c
+    java.util.Collection assumers -> J
     com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> h
-    boolean seenNotNeverMergePrefix -> S
     com.android.tools.r8.ir.optimize.Inliner inliner -> z
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer stringBuilderOptimizer -> j
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> v
     com.android.tools.r8.ir.optimize.library.LibraryMethodOptimizer libraryMethodOptimizer -> f
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> s
+    com.android.tools.r8.ir.optimize.AssertionsRewriter assertionsRewriter -> L
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> P
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportedMethodRewriter -> p
-    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> L
     com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> k
     com.android.tools.r8.utils.InternalOptions options -> t
     com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> D
-    com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> e
-    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> M
+    com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis fieldAccessAnalysis -> e
     com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring d8NestBasedAccessDesugaring -> m
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> G
-    1:1:void <clinit>():119:119 -> <clinit>
-    1:1:void <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):186:186 -> <init>
-    2:187:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):161:346 -> <init>
-    188:188:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):359:359 -> <init>
-    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$17(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:java.lang.String lambda$new$0(java.lang.String):207:207 -> a
-    2:6:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):401:405 -> a
-    7:14:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455:462 -> a
-    15:16:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):394:395 -> a
-    15:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):464 -> a
-    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):465:466 -> a
-    19:20:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):428:429 -> a
-    19:20:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):466 -> a
-    21:22:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):437:438 -> a
-    21:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):467 -> a
-    23:23:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):444:444 -> a
-    23:23:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):468 -> a
-    24:25:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):448:449 -> a
-    24:25:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):469 -> a
-    26:27:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):909:910 -> a
-    26:27:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):470 -> a
-    28:31:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):472:475 -> a
-    32:38:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479:485 -> a
-    39:40:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):510:511 -> a
-    39:40:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):486 -> a
-    41:48:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):106:113 -> a
-    41:48:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):512 -> a
-    41:48:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):486 -> a
-    49:49:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):512:512 -> a
-    49:49:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):486 -> a
-    50:52:void lambda$convertMethods$3(boolean,com.android.tools.r8.graph.DexEncodedMethod):558:560 -> a
-    53:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):566:594 -> a
-    82:82:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    82:82:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):594 -> a
-    83:83:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    83:83:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    83:83:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):594 -> a
-    84:88:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):594:598 -> a
-    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    89:89:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):598 -> a
-    90:98:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):598:606 -> a
-    99:102:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601:604 -> a
-    103:110:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601:608 -> a
-    111:111:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    111:111:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):608 -> a
-    112:116:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1528:1532 -> a
-    112:116:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):609 -> a
-    117:125:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):625:633 -> a
-    126:127:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):889:890 -> a
-    126:127:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):634 -> a
-    128:129:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):418:419 -> a
-    128:129:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):635 -> a
-    130:151:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):637:658 -> a
-    152:198:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):657:703 -> a
-    199:199:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    199:199:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):703 -> a
-    200:200:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):704:704 -> a
-    201:202:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):412:413 -> a
-    201:202:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):706 -> a
-    203:214:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:718 -> a
-    215:216:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):428:429 -> a
-    215:216:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718 -> a
-    217:217:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):720:720 -> a
-    218:219:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):437:438 -> a
-    218:219:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721 -> a
-    220:220:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):444:444 -> a
-    220:220:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
-    221:223:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):723:725 -> a
-    224:225: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):900:901 -> a
-    224:225:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727 -> a
-    226:226:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):729:729 -> a
-    227:228:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):909:910 -> a
-    227:228:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):730 -> a
-    229:231:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):732:734 -> a
-    232:251:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):733:752 -> a
-    252:264:com.android.tools.r8.graph.DexType computeOutlineClassType():950:962 -> a
-    252:264:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    265:265:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    265:265:com.android.tools.r8.graph.DexType computeOutlineClassType():962 -> a
-    265:265:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    266:322:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752:808 -> a
-    323:330:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):802:809 -> a
-    331:331:void lambda$optimize$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):665:665 -> a
-    332:333:void lambda$optimize$5(com.android.tools.r8.ir.code.IRCode):748:749 -> a
-    334:334:void addWaveDoneAction(com.android.tools.r8.utils.Action):829:829 -> a
-    335:335:boolean isInWave():839:839 -> a
-    335:335:void addWaveDoneAction(com.android.tools.r8.utils.Action):832 -> a
-    336:336:void addWaveDoneAction(com.android.tools.r8.utils.Action):835:835 -> a
-    337:337:void addWaveDoneAction(com.android.tools.r8.utils.Action):833:833 -> a
-    338:338:void addWaveDoneAction(com.android.tools.r8.utils.Action):830:830 -> a
-    339:339:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):843:843 -> a
-    340:342:void forEachSelectedOutliningMethod(java.util.function.Consumer,java.util.concurrent.ExecutorService):853:855 -> a
-    343:353:void lambda$forEachSelectedOutliningMethod$9(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):858:868 -> a
-    354:354:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):876:876 -> a
-    355:355:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):875:875 -> a
-    356:356:void clearDexMethodCompilationState():915:915 -> a
-    357:357:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):919:919 -> a
-    358:367:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):932:941 -> a
-    368:368:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1020:1020 -> a
-    368:368:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):941 -> a
-    369:369:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):941:941 -> a
-    370:370:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):940:940 -> a
-    371:374:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):969:972 -> a
-    375:379:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):978:982 -> a
-    380:380:void lambda$optimizeSynthesizedLambdaClasses$10(com.android.tools.r8.ir.conversion.LambdaMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):996:996 -> a
-    381:381:void lambda$processMethodsConcurrently$11(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):1016:1016 -> a
-    382:388:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1038:1044 -> a
-    389:391:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1079:1081 -> a
-    392:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1080:1085 -> a
-    398:398:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1020:1020 -> a
-    398:398:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1085 -> a
-    399:399:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1085:1085 -> a
-    400:412:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1084:1096 -> a
-    413:416:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1104:1107 -> a
-    417:422:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1729:1734 -> a
-    417:422:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1110 -> a
-    423:429:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1111:1117 -> a
-    430:430:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1343:1343 -> a
-    430:430:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1117 -> a
-    431:466:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1118:1153 -> a
-    467:467:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1482:1482 -> a
-    467:467:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
-    468:468:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    468:468:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1482 -> a
-    468:468:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
-    469:471:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1482:1484 -> a
-    469:471:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
-    472:472:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    472:472:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
-    472:472:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
-    473:476:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1485:1488 -> a
-    473:476:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
-    477:484:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1162:1169 -> a
-    485:485:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):97:97 -> a
-    485:485:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1170 -> a
-    486:514:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1171:1199 -> a
-    515:515:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):846:846 -> a
-    515:515:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1200 -> a
-    516:516:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):841:841 -> a
-    516:516:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1200 -> a
-    517:586:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1201:1270 -> a
-    587:589:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1049:1051 -> a
-    587:589:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1271 -> a
-    590:598:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1274:1282 -> a
-    599:634:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1281:1316 -> a
-    635:676:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1307:1348 -> a
-    677:677:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPrimary():20:20 -> a
-    677:677:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1348 -> a
-    678:701:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1349:1372 -> a
-    702:702:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPrimary():20:20 -> a
-    702:702:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1372 -> a
-    703:712:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1373:1382 -> a
-    713:713:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    713:713:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1382 -> a
-    714:724:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1383:1393 -> a
-    725:730:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):916:921 -> a
-    725:730:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1393 -> a
-    731:773:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1394:1436 -> a
-    774:774:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1351:1351 -> a
-    774:774:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1436 -> a
-    775:791:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1437:1453 -> a
-    792:797:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1452:1457 -> a
-    798:798:void lambda$optimize$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1191:1191 -> a
-    799:799:void lambda$optimize$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1195:1195 -> a
-    800:800:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1318:1318 -> a
-    801:806:void collectOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1463:1468 -> a
-    807:808:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1472:1473 -> a
-    809:809:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    809:809:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1473 -> a
-    810:814:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1492:1496 -> a
-    810:814:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474 -> a
-    815: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:1476 -> a
-    816:819:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1501:1504 -> a
-    816:819:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
-    820:824:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1528:1532 -> a
-    820: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
-    820:824:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
-    825:827:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1508 -> a
-    825:827:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
-    828:828:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1020:1020 -> 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):1508 -> 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):1477 -> 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):1508:1508 -> 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):1477 -> a
-    830:834:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507:1511 -> a
-    830:834:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
-    835:840:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1540:1545 -> a
-    841:841:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1376:1376 -> a
-    841:841:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
-    842:842:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546:1546 -> a
-    843:855:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3707:3719 -> a
-    843:855:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
-    856:856:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    856:856:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3720 -> a
-    856:856:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
-    857:858:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3720:3721 -> a
-    857:858:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
-    859:859:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3707:3707 -> a
-    859:859:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
-    860:869:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1557 -> a
-    870:870:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1556:1556 -> a
-    871:872:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1622:1623 -> a
-    873:873:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1621:1621 -> a
-    874:874:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1669:1669 -> a
-    875:875:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1745:1745 -> a
-    876:876:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    876:876:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1746 -> a
-    877:894:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1764 -> a
-    1:7:boolean enableTryWithResourcesDesugaring():376:382 -> b
-    8:13:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):491:496 -> b
-    14:25:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):494:505 -> b
-    26:35:void convertMethods(com.android.tools.r8.graph.DexProgramClass):547:556 -> b
-    36:38:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):757:759 -> b
-    39:42:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.DexEncodedMethod):882:885 -> b
-    43:50:void optimizeSynthesizedLambdaClasses(java.util.Collection,java.util.concurrent.ExecutorService):988:995 -> b
-    51:58:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1058:1065 -> b
-    59:59:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1063:1063 -> b
-    60:65:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1517:1522 -> b
-    66:70:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1520:1524 -> b
-    71:75:boolean lambda$workaroundForwardingInitializerBug$15(com.android.tools.r8.ir.code.Instruction):1585:1589 -> b
-    76:77:void printPhase(java.lang.String):1739:1740 -> b
-    1:1:boolean enableTwrCloseResourceDesugaring():372:372 -> c
-    2:21:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):518:537 -> c
-    22:28:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):536:542 -> c
+    1:1:void <clinit>():120:120 -> <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):188:188 -> <init>
+    2:191:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):163:352 -> <init>
+    192:192:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):357:357 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    1:1:java.lang.String lambda$new$0(java.lang.String):210:210 -> a
+    2:3:boolean removeLambdaDeserializationMethods():384:385 -> a
+    2:3:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):450 -> a
+    4:9:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):452:457 -> a
+    10:11:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):392:393 -> a
+    10:11:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    12:13:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460:461 -> a
+    14:15:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):423:424 -> a
+    14:15:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461 -> a
+    16:17:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):432:433 -> a
+    16:17:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):462 -> a
+    18:18:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):439:439 -> a
+    18:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):463 -> a
+    19:20:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):443:444 -> a
+    19:20:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):464 -> a
+    21:22:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):898:899 -> a
+    21:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):465 -> a
+    23:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):467:470 -> a
+    27:29:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):399:401 -> a
+    30:36:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):474:480 -> a
+    37:38:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):505:506 -> a
+    37:38:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):481 -> a
+    39:46:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):106:113 -> a
+    39:46:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):507 -> a
+    39:46:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):481 -> a
+    47:47:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):507:507 -> a
+    47:47:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):481 -> a
+    48:50:void lambda$convertMethods$3(boolean,com.android.tools.r8.graph.DexEncodedMethod):553:555 -> a
+    51:79:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):561:589 -> a
+    80:80:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    80:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589 -> a
+    81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589 -> a
+    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589:593 -> a
+    87:87:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    87:87:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):593 -> a
+    88:96:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):593:601 -> a
+    97:101:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:596 -> a
+    108:108:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:603 -> a
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    109:109:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603 -> a
+    110:114:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1623:1627 -> a
+    110:114:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> a
+    115:117:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):620:622 -> a
+    118:119:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):878:879 -> a
+    118:119:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):623 -> a
+    120:121:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):413:414 -> a
+    120:121:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):624 -> a
+    122:133:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):632:643 -> a
+    134:185:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):642:693 -> a
+    186:186:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    186:186:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):693 -> a
+    187:187:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):694:694 -> a
+    188:189:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):407:408 -> a
+    188:189:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):696 -> a
+    190:201:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):697:708 -> a
+    202:203:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):423:424 -> a
+    202:203:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
+    204:206:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):709:711 -> a
+    207:208:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):432:433 -> a
+    207:208:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):712 -> a
+    209:209:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):439:439 -> a
+    209:209:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713 -> a
+    210:212:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714:716 -> a
+    213:214: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):889:890 -> a
+    213:214:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718 -> a
+    215:215:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):720:720 -> a
+    216:217:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):898:899 -> a
+    216:217:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721 -> a
+    218:220:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):723:725 -> a
+    221:240:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:743 -> a
+    241:253:com.android.tools.r8.graph.DexType computeOutlineClassType():940:952 -> a
+    241:253:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    254:254:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    254:254:com.android.tools.r8.graph.DexType computeOutlineClassType():952 -> a
+    254:254:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    255:312:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743:800 -> a
+    313:320:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):794:801 -> a
+    321:321:com.android.tools.r8.utils.Timing lambda$optimize$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):650:650 -> a
+    322:323:void lambda$optimize$5(com.android.tools.r8.ir.code.IRCode):739:740 -> a
+    324:329:void waveDone(java.util.Collection):809:814 -> a
+    330:330:void addWaveDoneAction(com.android.tools.r8.utils.Action):818:818 -> a
+    331:331:boolean isInWave():828:828 -> a
+    331:331:void addWaveDoneAction(com.android.tools.r8.utils.Action):821 -> a
+    332:332:void addWaveDoneAction(com.android.tools.r8.utils.Action):824:824 -> a
+    333:333:void addWaveDoneAction(com.android.tools.r8.utils.Action):822:822 -> a
+    334:334:void addWaveDoneAction(com.android.tools.r8.utils.Action):819:819 -> a
+    335:335:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):832:832 -> a
+    336:338:void forEachSelectedOutliningMethod(java.util.function.Consumer,java.util.concurrent.ExecutorService):842:844 -> a
+    339:349:void lambda$forEachSelectedOutliningMethod$9(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):847:857 -> a
+    350:350:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):865:865 -> a
+    351:351:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):864:864 -> a
+    352:352:void clearDexMethodCompilationState():904:904 -> a
+    353:353:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):908:908 -> a
+    354:364:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):921:931 -> a
+    365:365:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):994:994 -> a
+    365:365:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):931 -> a
+    366:366:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):931:931 -> a
+    367:367:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):930:930 -> a
+    368:371:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):959:962 -> a
+    372:376:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):968:972 -> a
+    377:377:void lambda$processMethodsConcurrently$10(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):990:990 -> a
+    378:386:com.android.tools.r8.utils.Timing processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1010:1018 -> a
+    387:389:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1052:1054 -> a
+    390:395:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1053:1058 -> a
+    396:396:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):994:994 -> a
+    396:396:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1058 -> a
+    397:397:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1058:1058 -> a
+    398:410:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1057:1069 -> a
+    411:415:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1075:1079 -> a
+    416:421:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1833:1838 -> a
+    416:421:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1082 -> a
+    422:428:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1083:1089 -> a
+    429:429:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1358:1358 -> a
+    429:429:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1089 -> a
+    430:443:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1090:1103 -> a
+    444:478:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1102:1136 -> a
+    479:479:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1572:1572 -> a
+    479:479:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1137 -> a
+    480:480:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    480:480:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1572 -> a
+    480:480:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1137 -> a
+    481:483:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1572:1574 -> a
+    481:483:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1137 -> a
+    484:484:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    484:484:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1574 -> a
+    484:484:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1137 -> a
+    485:488:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1575:1578 -> a
+    485:488:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1137 -> a
+    489:502:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1145:1158 -> a
+    503:503:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):97:97 -> a
+    503:503:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1158 -> a
+    504:541:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1159:1196 -> a
+    542:542:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):846:846 -> a
+    542:542:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1196 -> a
+    543:543:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):841:841 -> a
+    543:543:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1196 -> a
+    544:658:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1197:1311 -> a
+    659:661:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1022:1024 -> a
+    659:661:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1312 -> a
+    662:673:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1315:1326 -> a
+    674:718:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1325:1369 -> a
+    719:764:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1360:1405 -> a
+    765:765:void com.android.tools.r8.ir.optimize.EnumUnboxer.unboxEnums(com.android.tools.r8.ir.code.IRCode):0:0 -> a
+    765:765:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1405 -> a
+    766:809:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1409:1452 -> a
+    810:810:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    810:810:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1452 -> a
+    811:829:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1453:1471 -> a
+    830:835:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):920:925 -> a
+    830:835:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1471 -> a
+    836:897:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1472:1533 -> a
+    898:898:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1366:1366 -> a
+    898:898:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1533 -> a
+    899:907:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1534:1542 -> a
+    908:908:void lambda$optimize$11(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1185:1185 -> a
+    909:909:void lambda$optimize$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1189:1189 -> a
+    910:910:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1371:1371 -> a
+    911:916:void collectOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1552:1557 -> a
+    917:918:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1562:1563 -> a
+    919:919:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    919:919:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1563 -> a
+    920:924:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1582:1586 -> a
+    920:924:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1564 -> a
+    925:925:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1566:1566 -> a
+    926:931:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1592:1597 -> a
+    926:931:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1567 -> a
+    932:936:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1623:1627 -> a
+    932:936:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1598 -> a
+    932:936:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1567 -> a
+    937:939:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1599:1601 -> a
+    937:939:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1567 -> a
+    940:940:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):994:994 -> a
+    940:940:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1601 -> a
+    940:940:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1567 -> a
+    941:941:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1601:1601 -> a
+    941:941:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1567 -> a
+    942:948:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1600:1606 -> a
+    942:948:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1567 -> a
+    949:954:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1612:1617 -> a
+    955:959:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1615:1619 -> a
+    960:969:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1636:1645 -> a
+    970:970:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1391:1391 -> a
+    970:970:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1645 -> a
+    971:971:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1646:1646 -> a
+    972:984:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3707:3719 -> a
+    972:984:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1646 -> a
+    985:985:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> a
+    985:985:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3720 -> a
+    985:985:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1646 -> a
+    986:987:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3720:3721 -> a
+    986:987:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1646 -> a
+    988:988:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3707:3707 -> a
+    988:988:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1646 -> a
+    989:1002:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1648:1661 -> a
+    1003:1003:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1660:1660 -> a
+    1004:1005:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1726:1727 -> a
+    1006:1006:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1725:1725 -> a
+    1007:1007:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1773:1773 -> a
+    1008:1008:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1849:1849 -> a
+    1009:1009:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    1009:1009:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1850 -> a
+    1010:1027:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1851:1868 -> a
+    1:7:boolean enableTryWithResourcesDesugaring():374:380 -> b
+    8:13:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):486:491 -> b
+    14:25:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):489:500 -> b
+    26:35:void convertMethods(com.android.tools.r8.graph.DexProgramClass):542:551 -> b
+    36:39:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):748:751 -> b
+    40:40:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):750:750 -> b
+    41:41:void waveStart(java.util.Collection):805:805 -> b
+    42:45:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.DexEncodedMethod):871:874 -> b
+    46:47:void processMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):988:989 -> b
+    48:55:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1031:1038 -> b
+    56:56:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1036:1036 -> b
+    57:61:boolean lambda$workaroundForwardingInitializerBug$14(com.android.tools.r8.ir.code.Instruction):1689:1693 -> b
+    62:63:void printPhase(java.lang.String):1843:1844 -> b
+    1:1:boolean enableTwrCloseResourceDesugaring():370:370 -> c
+    2:21:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):513:532 -> c
+    22:28:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531:537 -> c
     29:42:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):129:142 -> c
-    29:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):542 -> c
-    43:43:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):542:542 -> c
-    44:45:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexProgramClass):844:845 -> c
-    46:46:void lambda$computeReachabilitySensitivity$7(com.android.tools.r8.graph.DexEncodedMethod):845:845 -> c
-    47:48:void processMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):1014:1015 -> c
-    49:49:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1614:1614 -> c
-    50:50:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1327:1327 -> c
-    50:50:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1614 -> c
-    51:62:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1617:1628 -> c
-    63:65:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1674:1676 -> c
-    63:65:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1629 -> c
-    66:66:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1632:1632 -> c
-    67:68:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1681:1682 -> c
-    67:68:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1633 -> c
-    69:70:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1686:1687 -> c
-    69:70:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1636 -> c
-    71:72:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1639:1640 -> c
-    73:77:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1660:1664 -> c
-    73:77:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641 -> c
-    78:83:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1642:1647 -> c
-    84:95:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1696:1707 -> c
-    84:95:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1648 -> c
-    1:4:java.util.Set getDesugaredCallSites():350:353 -> d
-    5:5:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):495:495 -> d
-    6:9:void waveStart(java.util.Collection,java.util.concurrent.ExecutorService):814:817 -> d
-    10:15:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):1002:1007 -> d
-    16:16:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):1004:1004 -> d
-    17:17:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1563:1563 -> d
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1364:1364 -> d
-    18:18:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1563 -> d
-    19:35:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1567:1583 -> d
-    36:39:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1713:1716 -> d
-    36:39:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1594 -> d
-    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):1045:1045 -> d
-    40:40:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1716 -> d
-    40:40:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1594 -> d
-    41:49:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1717:1725 -> d
-    41:49:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1594 -> d
-    1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):534:534 -> e
-    2:2:java.util.List getOptimizationsForPostIRProcessing():1030:1030 -> e
-    1:1:boolean isInWave():839:839 -> f
-    1:5:com.android.tools.r8.graph.DexApplication optimize():616:620 -> g
-    1:2:boolean removeLambdaDeserializationMethods():386:387 -> h
-    1:3:void waveDone():823:825 -> i
-com.android.tools.r8.ir.conversion.LambdaMethodProcessor -> com.android.tools.r8.ir.conversion.P:
-    java.util.Deque waves -> a
-    java.util.Collection wave -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):32:35 -> <init>
-    1:2:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):44:45 -> a
-    3:3:boolean com.android.tools.r8.ir.conversion.CallGraph.isEmpty():181:181 -> a
-    3:3:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):46 -> a
-    4:4:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):47:47 -> a
-    5:5:boolean isProcessedConcurrently(com.android.tools.r8.graph.DexEncodedMethod):54:54 -> a
-    6:10:void forEachMethod(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):62:66 -> a
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():40:40 -> b
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.S:
+    29:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):537 -> c
+    43:43:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):537:537 -> c
+    44:45:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexProgramClass):833:834 -> c
+    46:46:void lambda$computeReachabilitySensitivity$7(com.android.tools.r8.graph.DexEncodedMethod):834:834 -> c
+    47:47:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1718:1718 -> c
+    48:48:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1342:1342 -> c
+    48:48:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1718 -> c
+    49:60:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1721:1732 -> c
+    61:63:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1778:1780 -> c
+    61:63:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1733 -> c
+    64:64:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1736:1736 -> c
+    65:66:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1785:1786 -> c
+    65:66:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1737 -> c
+    67:68:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1790:1791 -> c
+    67:68:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1740 -> c
+    69:70:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1743:1744 -> c
+    71:75:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1764:1768 -> c
+    71:75:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1745 -> c
+    76:81:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1746:1751 -> c
+    82:93: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):1800:1811 -> c
+    82:93:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1752 -> c
+    1:1:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):490:490 -> d
+    2:7:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):976:981 -> d
+    8:8:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):978:978 -> d
+    9:9:java.util.List getOptimizationsForPostIRProcessing():1004:1004 -> d
+    10:10:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1667:1667 -> d
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1379:1379 -> d
+    11:11:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1667 -> d
+    12:28:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1671:1687 -> d
+    29:32:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1817:1820 -> d
+    29:32:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1698 -> d
+    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):1049:1049 -> d
+    33:33:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1820 -> d
+    33:33:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1698 -> d
+    34:42:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1821:1829 -> d
+    34:42:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1698 -> d
+    1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):529:529 -> e
+    2:2:boolean isInWave():828:828 -> e
+    1:5:com.android.tools.r8.graph.DexApplication optimize():611:615 -> f
+com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.Q:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -28622,7 +28601,7 @@
     544:544:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):665 -> a
     545:548:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):668:671 -> 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):366:366 -> b
-com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.ir.conversion.Q:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.ir.conversion.P:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> e
@@ -28633,7 +28612,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):682:686 -> <init>
     1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):691:704 -> a
     15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):701:701 -> a
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.ir.conversion.T:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.ir.conversion.S:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
@@ -28652,31 +28631,31 @@
     void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
     void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod) -> d
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> e
-    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> f
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> g
-    void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> h
-    void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> i
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.ir.conversion.U:
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> f
+    void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> g
+    void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> h
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.ir.conversion.T:
     boolean isProcessedConcurrently(com.android.tools.r8.graph.DexEncodedMethod) -> a
-    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():24 -> a
-    com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase() -> b
-com.android.tools.r8.ir.conversion.MethodProcessor$Phase -> com.android.tools.r8.ir.conversion.U$a:
-    com.android.tools.r8.ir.conversion.MethodProcessor$Phase POST -> d
-    com.android.tools.r8.ir.conversion.MethodProcessor$Phase PRIMARY -> c
-    com.android.tools.r8.ir.conversion.MethodProcessor$Phase LAMBDA_PROCESSING -> b
+    1:1:boolean isPrimary():19:19 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
+    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():27 -> b
+    com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase() -> c
+    1:1:boolean isPost():23:23 -> d
+com.android.tools.r8.ir.conversion.MethodProcessor$Phase -> com.android.tools.r8.ir.conversion.T$a:
+    com.android.tools.r8.ir.conversion.MethodProcessor$Phase POST -> c
+    com.android.tools.r8.ir.conversion.MethodProcessor$Phase PRIMARY -> b
     com.android.tools.r8.ir.conversion.MethodProcessor$Phase ONE_TIME -> a
-    1:4:void <clinit>():11:14 -> <clinit>
+    1:3:void <clinit>():11:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.ir.conversion.V:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.ir.conversion.U:
     java.util.Collection wave -> a
     1:2:void <init>(java.util.Collection):21:22 -> <init>
     1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor getInstance(java.util.Collection):30:30 -> a
     2:2:boolean isProcessedConcurrently(com.android.tools.r8.graph.DexEncodedMethod):40:40 -> a
     3:3:void forEachWave(com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):47:47 -> a
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():35:35 -> b
-    1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor getInstance():26:26 -> c
-com.android.tools.r8.ir.conversion.PartialCallGraphBuilder -> com.android.tools.r8.ir.conversion.W:
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():35:35 -> c
+    1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor getInstance():26:26 -> e
+com.android.tools.r8.ir.conversion.PartialCallGraphBuilder -> com.android.tools.r8.ir.conversion.V:
     java.util.Set seeds -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():14:14 -> <clinit>
@@ -28686,61 +28665,68 @@
     3:4:boolean verifyAllMethodsWithCodeExists():37:38 -> a
     1:3:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):29:31 -> b
     4:4:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):30:30 -> b
-com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.ir.conversion.Y:
+com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.ir.conversion.X:
     java.util.Map methodsMap -> b
     java.util.Deque waves -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection wave -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.PostMethodProcessor$1):28:28 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):38:41 -> <init>
-    1:2:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):102:103 -> a
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.PostMethodProcessor$1):30:30 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):40:43 -> <init>
+    1:2:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):111:112 -> a
     3:3:boolean com.android.tools.r8.ir.conversion.CallGraph.isEmpty():181:181 -> a
-    3:3:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):106 -> a
-    4:7:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):107:110 -> a
-    8:8:boolean isProcessedConcurrently(com.android.tools.r8.graph.DexEncodedMethod):119:119 -> a
-    9:12:void forEachWave(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):124:127 -> a
-    13:14:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):130:131 -> a
-    15:27:void forEachMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):144:156 -> a
-    15:27:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():46:46 -> b
-com.android.tools.r8.ir.conversion.PostMethodProcessor$1 -> com.android.tools.r8.ir.conversion.X:
-com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.ir.conversion.Y$a:
+    3:3:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):115 -> a
+    4:7:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):116:119 -> a
+    8:8:boolean isProcessedConcurrently(com.android.tools.r8.graph.DexEncodedMethod):128:128 -> a
+    9:12:void forEachWave(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):133:136 -> a
+    13:14:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):139:140 -> a
+    15:27:void forEachMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):153:165 -> a
+    15:27:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):141 -> a
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():48:48 -> c
+com.android.tools.r8.ir.conversion.PostMethodProcessor$1 -> com.android.tools.r8.ir.conversion.W:
+com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.ir.conversion.X$a:
     java.util.Map methodsMap -> b
     java.util.Collection defaultCodeOptimizations -> a
-    1:1:void <init>(java.util.Collection):54:54 -> <init>
-    2:5:void <init>(java.util.Collection):52:55 -> <init>
-    1:11:void put(java.util.Set,java.util.Collection):60:70 -> a
-    12:12:java.util.Collection lambda$put$0(com.android.tools.r8.graph.DexEncodedMethod):69:69 -> a
-    13:13:void put(java.util.Set):75:75 -> a
-    14:18:void put(com.android.tools.r8.ir.conversion.PostOptimization):80:84 -> a
-    19:26:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):90:97 -> a
-com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.ir.conversion.Z:
+    1:1:void <init>(java.util.Collection):56:56 -> <init>
+    2:5:void <init>(java.util.Collection):54:57 -> <init>
+    1:11:void put(java.util.Set,java.util.Collection):62:72 -> a
+    12:12:java.util.Collection lambda$put$0(com.android.tools.r8.graph.DexEncodedMethod):71:71 -> a
+    13:13:void put(java.util.Set):77:77 -> a
+    14:18:void put(com.android.tools.r8.ir.conversion.PostOptimization):82:86 -> a
+    19:24:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):92:97 -> a
+    25:25:void put(java.util.Set):77:77 -> a
+    25:25:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):93 -> a
+    26:33:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):99:106 -> a
+com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.ir.conversion.Y:
     java.util.Set methodsToRevisit() -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.ir.conversion.a0:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.ir.conversion.Z:
     java.util.Deque waves -> c
     java.util.Collection wave -> d
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> b
-    1:1:void <clinit>():32:32 -> <clinit>
+    1:1:void <clinit>():33:33 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.ir.conversion.CallGraph):48:51 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():71:71 -> a
-    2:27:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):76:101 -> a
-    28:32: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):87:91 -> a
-    33:33:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):92:92 -> a
-    34:44:void extractLeaves(java.util.Set,java.util.function.Consumer):113:123 -> a
-    45:45:boolean isProcessedConcurrently(com.android.tools.r8.graph.DexEncodedMethod):128:128 -> a
-    46:51:void forEachMethod(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):143:148 -> a
-    52:52:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):170:170 -> a
-    52:52:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60 -> a
-    53:54:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60:61 -> a
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():66:66 -> b
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.ir.conversion.a0$a:
-    void notifyWaveStart(java.util.Collection,java.util.concurrent.ExecutorService) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.ir.conversion.b0:
+    1:29:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):76:104 -> a
+    30:34: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):88:92 -> a
+    35:35:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):93:93 -> a
+    36:37:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):108:109 -> a
+    36:37:void forEachMethod(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):147 -> a
+    38:44:void forEachMethod(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):147:153 -> a
+    45:56:void forEachMethod(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):152:163 -> a
+    57:67:void extractLeaves(java.util.Set,java.util.function.Consumer):115:125 -> a
+    68:68:boolean isProcessedConcurrently(com.android.tools.r8.graph.DexEncodedMethod):130:130 -> a
+    69:70:com.android.tools.r8.utils.Timing lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.graph.DexEncodedMethod):156:157 -> a
+    71:71:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):170:170 -> a
+    71:71:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60 -> a
+    72:73:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60:61 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():71:71 -> b
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():66:66 -> c
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.ir.conversion.Z$a:
+    void notifyWaveStart(java.util.Collection) -> a
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.ir.conversion.a0:
     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
@@ -28762,11 +28748,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.k0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.ir.conversion.j0:
     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.c0:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.ir.conversion.e0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.ir.conversion.b0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.ir.conversion.d0:
     com.android.tools.r8.ir.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
@@ -28777,7 +28763,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.d0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.ir.conversion.c0:
     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
@@ -28800,7 +28786,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.g0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.ir.conversion.f0:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -28812,7 +28798,7 @@
     31:31:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
     31:31:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298 -> a
     31:31: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.f0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.ir.conversion.e0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():195:195 -> <clinit>
@@ -28826,7 +28812,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.i0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.ir.conversion.h0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> c
     com.android.tools.r8.ir.code.Value stringHashValue -> b
     boolean $assertionsDisabled -> d
@@ -28838,7 +28824,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.h0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.ir.conversion.g0:
     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
@@ -28865,12 +28851,12 @@
     116:116:boolean addMappingsForStringsWithHash(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.Set):529:529 -> a
     117:130:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):547:560 -> a
     1:27:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):373:399 -> b
-    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1461:1463 -> b
+    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1465:1467 -> b
     28:30:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):399 -> b
     31:31:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):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.j0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.ir.conversion.i0:
     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
@@ -28881,7 +28867,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.l0:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.ir.conversion.k0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> b
     boolean $assertionsDisabled -> e
@@ -28891,22 +28877,22 @@
     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):1045:1045 -> 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):1049:1049 -> 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):1045:1045 -> 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
-    89:90:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    89:90: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
-    91:91:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> a
-    91:91:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):141 -> a
-    92:92:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
-    92:92:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298 -> a
+    47: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):104:110 -> a
+    54:54:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
+    54:54: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
+    55:76: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
+    77:89: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
+    90:91:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    90: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:92:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> a
     92:92: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
-    93:105: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.n0:
+    93:93:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
+    93:93:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298 -> a
+    93:93: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
+    94:106: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.m0:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -28920,13 +28906,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.m0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.ir.conversion.l0:
     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.o0:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.ir.conversion.n0:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -29047,7 +29033,7 @@
     2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):76:92 -> <init>
     1:7:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApiLevel):96:102 -> a
     8:8:void desugar(com.android.tools.r8.ir.code.IRCode):107:107 -> a
-    9:9:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    9:9:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     9:9:void desugar(com.android.tools.r8.ir.code.IRCode):111 -> a
     10:50:void desugar(com.android.tools.r8.ir.code.IRCode):112:152 -> a
     51:51:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():294:294 -> a
@@ -29058,11 +29044,11 @@
     61:66:void desugar(com.android.tools.r8.ir.code.IRCode):168:173 -> a
     67:67:boolean hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):188:188 -> a
     68:71:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):193:196 -> a
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     72:72:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):196 -> a
     73:73:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):331:331 -> a
     73:73:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):197 -> a
-    74:74:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    74:74:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     74:74:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):331 -> a
     74:74:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):197 -> a
     75:89:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):331:345 -> a
@@ -29094,7 +29080,7 @@
     127:127:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):197 -> a
     128:128:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):255:255 -> a
     128:128:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):199 -> a
-    129:129:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    129:129:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     129:129:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):255 -> a
     129:129:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):199 -> a
     130:130:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):255:255 -> a
@@ -29158,7 +29144,7 @@
     189:189:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):207 -> a
     190:190:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):179:179 -> a
     190:190:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):209 -> a
-    191:191:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    191:191:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
     191:191:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):180 -> a
     191:191:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):209 -> a
     192:192:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):181:181 -> a
@@ -29194,8 +29180,7 @@
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1808:1808 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1812:1814 -> <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):1820:1821 -> 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):1820:1820 -> a
+    1: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):1820:1820 -> a
     4:27:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1826:1849 -> a
     28:28:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855:1855 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.t.c.b$c:
@@ -29213,8 +29198,7 @@
     boolean isStatic -> d
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):1734:1736 -> <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):1742:1743 -> 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):1742:1742 -> a
+    1: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):1742:1742 -> a
     4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1748:1754 -> a
     11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1760:1760 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.t.c.b$f:
@@ -29243,7 +29227,7 @@
     161:161:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1661:1661 -> a
     162:163:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1689:1690 -> a
     162:163:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1661 -> a
-    164:164:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    164:164:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     164:164:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1690 -> a
     164:164:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1661 -> a
     165:168:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1692:1695 -> a
@@ -29448,7 +29432,7 @@
     25:26:boolean hasVirtualMethodWithSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):258:259 -> a
     25:26:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):85 -> a
     27:27:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):86:86 -> a
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
     28:28:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):90 -> a
     29:29:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):90:90 -> a
     30:30:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):87:87 -> a
@@ -29475,7 +29459,7 @@
     128:128:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     128:128:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):221 -> a
     129:148:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):221:240 -> a
-    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
     149:149:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):244 -> a
     150:150:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):244:244 -> a
     151:151:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):241:241 -> a
@@ -29567,7 +29551,7 @@
     19:22:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):186:189 -> a
     19:22:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):147 -> a
     19:22:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     23:23:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):189 -> a
     23:23:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):147 -> a
     23:23:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
@@ -29591,7 +29575,7 @@
     70:70: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):436 -> a
     70:70: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):321 -> a
     70:70:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
     71:71: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):459 -> a
     71:71: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):436 -> a
     71:71: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):321 -> a
@@ -29608,7 +29592,7 @@
     103:103: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):429 -> a
     103: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):349 -> a
     103:103:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
     104:104: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):459 -> a
     104:104: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):429 -> a
     104:104: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):349 -> a
@@ -29621,15 +29605,15 @@
     128:128: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
     128:128: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 -> a
     128:128:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    129:130:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):371:372 -> a
-    129:130:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    131:151:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):371:391 -> a
-    131:151:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
+    129:131:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):371:371 -> a
+    129:131:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
+    135: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):375:391 -> a
+    135:151:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
     152:161:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):153:162 -> a
     162:162:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     162:162:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):162 -> a
     163:167:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):166:170 -> a
-    168:168:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    168:168:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     168:168:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):170 -> a
     169:172:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):173:176 -> a
     173:187:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):211:225 -> a
@@ -29664,7 +29648,7 @@
     25:25:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.utils.InternalOptions):101 -> a
     26:26:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.utils.InternalOptions):102:102 -> a
     27:27:java.lang.String getSynthesizedLibraryClassesPackagePrefix(com.android.tools.r8.graph.AppView):114:114 -> a
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     28:28:java.lang.String getSynthesizedLibraryClassesPackagePrefix(com.android.tools.r8.graph.AppView):114 -> a
     29:29:java.lang.String getSynthesizedLibraryClassesPackagePrefix(com.android.tools.r8.graph.AppView):115:115 -> a
     30:36:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):133:139 -> a
@@ -29773,13 +29757,13 @@
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     2:2:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):133 -> a
     3:3:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):137:137 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     4:4:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):137 -> a
     5:18:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):177:190 -> a
     19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     19:19:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):190 -> a
     20:21:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):192:193 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     22:22:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):193 -> a
     23:35:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):192:204 -> a
     36:37:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):195:196 -> a
@@ -29804,7 +29788,7 @@
     78:78:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> a
     79:79:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):345:345 -> a
     79:79:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> a
-    80:80:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    80:80:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     80:80:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):345 -> a
     80:80:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> a
     81:84:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):345:348 -> a
@@ -29844,7 +29828,7 @@
     203:203:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     203:203:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):433 -> a
     204:204:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):435:435 -> a
-    205:205:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    205:205:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     205:205:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):435 -> a
     206:212:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):435:441 -> a
     213:213:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
@@ -30007,7 +29991,7 @@
     283:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):373 -> a
     284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):239:239 -> a
     285:285:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):440:440 -> a
-    286:286:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    286:286:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     286:286:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):440 -> a
     287:291:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):440:444 -> a
     292:297:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):499:504 -> a
@@ -30069,7 +30053,7 @@
     481:481:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):779 -> a
     482:484:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):840:842 -> a
     485:485:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919:919 -> a
-    486:486:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    486:486:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     486:486:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
     487:490:java.util.Map processEmulatedInterfaceHierarchy() -> a
     487:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):468 -> a
@@ -30090,7 +30074,7 @@
     501:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):920 -> a
     503:513:void duplicateEmulatedInterfaces():850:860 -> a
     503:513:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):922 -> a
-    514:514:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    514:514:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     514:514:void duplicateEmulatedInterfaces():860 -> a
     514:514:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):922 -> a
     515:516:void duplicateEmulatedInterfaces():861:862 -> a
@@ -30115,125 +30099,125 @@
     548:553:void duplicateEmulatedInterfaces():874:879 -> a
     548:553:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):922 -> a
     554:554:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):926:926 -> a
-    555:557:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):982:984 -> a
+    555:557:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):984:986 -> a
     555:557:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):926 -> a
-    558:559:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):959:960 -> a
-    558:559:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):985 -> a
+    558:559:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):960:961 -> a
+    558:559:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):987 -> a
     558:559:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):926 -> a
-    560:564:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):986:990 -> a
+    560:564:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):988:992 -> a
     560:564:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):926 -> a
     565:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):932:932 -> a
-    566:568:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):964:966 -> a
-    566:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):933 -> a
-    569:570:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):959:960 -> a
-    569:570:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):967 -> a
-    569:570:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):933 -> a
-    571:580:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):968:977 -> a
-    571:580:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):933 -> a
-    581:585:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):933:937 -> a
+    566:568:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):966:968 -> a
+    566:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):934 -> a
+    569:570:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):960:961 -> a
+    569:570:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):969 -> a
+    569:570:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):934 -> a
+    571:580:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):970:979 -> a
+    571:580:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):934 -> a
+    581:585:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):934:938 -> a
     586:586:boolean isInMainDexList(com.android.tools.r8.graph.DexType):729:729 -> a
-    586:586:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):937 -> a
-    587:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):937:941 -> a
-    592:592:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    592:592:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):941 -> a
+    586:586:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
+    587:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938:942 -> a
+    592:592:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
+    592:592:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942 -> a
     593:594:void renameEmulatedInterfaces():795:796 -> a
-    593:594:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942 -> a
+    593:594:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):943 -> a
     595:603:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):808:816 -> a
     595:603:void renameEmulatedInterfaces():797 -> a
-    595:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942 -> a
+    595:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):943 -> a
     604:607:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):827:830 -> a
     604:607:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):816 -> a
     604:607:void renameEmulatedInterfaces():797 -> a
-    604:607:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942 -> a
+    604:607:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):943 -> a
     608:608:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):818:818 -> a
     608:608:void renameEmulatedInterfaces():797 -> a
-    608:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942 -> a
+    608:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):943 -> a
     609:609:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     609:609:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):818 -> a
     609:609:void renameEmulatedInterfaces():797 -> a
-    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942 -> a
+    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):943 -> a
     610:610:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):820:820 -> a
     610:610:void renameEmulatedInterfaces():797 -> a
-    610:610:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942 -> a
+    610:610:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):943 -> a
     611:613:void renameEmulatedInterfaces():798:800 -> a
-    611:613:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942 -> a
+    611:613:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):943 -> a
     614:616:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):834:836 -> a
     614:616:void renameEmulatedInterfaces():801 -> a
-    614:616:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942 -> a
-    617:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):945:945 -> a
-    618:620:void clear():952:954 -> a
-    618:620:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):948 -> a
-    621:635:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):994:1008 -> a
-    636:636:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1001:1001 -> a
-    637:648:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1016:1027 -> a
+    614:616:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):943 -> a
+    617:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):946:946 -> a
+    618:620:void clear():953:955 -> a
+    618:620:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):949 -> a
+    621:635:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):996:1010 -> a
+    636:636:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1003:1003 -> a
+    637:648:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1018:1029 -> a
     649:649:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    649:649:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1028 -> a
-    650:659:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1029:1038 -> a
-    660:660:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1056:1056 -> a
+    649:649:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1030 -> a
+    650:659:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1031:1040 -> a
+    660:660:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1058:1058 -> a
     661:661:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):33:33 -> a
-    661:661:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1056 -> a
-    662:662:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1057:1057 -> a
+    661:661:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1058 -> a
+    662:662:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1059:1059 -> a
     663:663:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):711:711 -> a
-    663:663:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1058 -> a
-    664:676:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1058:1070 -> a
-    677:677:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086:1086 -> a
-    678:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1099:1100 -> a
-    678:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1090 -> a
+    663:663:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1060 -> a
+    664:676:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1060:1072 -> a
+    677:677:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088:1088 -> a
+    678:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1101:1102 -> a
+    678:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1092 -> a
     680:680:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> 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):1100 -> 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):1090 -> a
-    681:682:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1048:1049 -> a
-    681: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):1102 -> a
-    681: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):1090 -> a
-    683: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):1103:1105 -> a
-    683: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):1090 -> 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):1102 -> 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):1092 -> a
+    681:682:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1050:1051 -> a
+    681: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):1104 -> a
+    681: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):1092 -> a
+    683: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):1105:1107 -> a
+    683: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):1092 -> a
     686:686:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):436:436 -> a
-    686:686:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111 -> a
-    686:686:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1090 -> a
-    687:713:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1116:1142 -> a
-    687:713:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1090 -> a
-    714:714:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1091:1091 -> a
-    715:717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1108 -> a
-    715:717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1090 -> a
+    686:686:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1113 -> a
+    686:686:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1092 -> a
+    687:713:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1118:1144 -> a
+    687:713:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1092 -> a
+    714:714:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093:1093 -> a
+    715:717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1108:1110 -> a
+    715:717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1092 -> a
     718:718:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    718:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1108 -> a
-    718:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1090 -> a
-    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1108:1108 -> a
-    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1090 -> a
-    720:721:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1147:1148 -> a
-    722:722:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    722:722:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1150 -> a
-    723:727:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1151:1155 -> a
-    728:728:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    728:728:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1156 -> a
-    729:729:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1158:1158 -> a
+    718:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1110 -> a
+    718:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1092 -> a
+    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1110:1110 -> a
+    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1092 -> a
+    720:721:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1149:1150 -> a
+    722:722:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> a
+    722:722:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1152 -> a
+    723:727:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1153:1157 -> a
+    728:728:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> a
+    728:728:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1158 -> a
+    729:729:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1160:1160 -> a
     1:2:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):449:450 -> b
     3:4:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):662:663 -> b
     5:5:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):656:656 -> b
     5:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):664 -> b
     6:6:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):665:665 -> b
     7:7:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):711:711 -> b
-    8:9:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1048:1049 -> b
+    8:9:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1050:1051 -> b
     1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):174:174 -> c
     2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):721:721 -> c
     3:3:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):711:711 -> c
     3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):721 -> c
     4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):721:724 -> c
     8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):723:725 -> c
-    11:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1074:1075 -> c
+    11:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1076:1077 -> c
     13:13:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):716:716 -> c
-    13:13:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1076 -> c
-    14:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1078:1078 -> c
+    13:13:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1078 -> c
+    14:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1080:1080 -> c
     15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> c
-    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1078 -> c
-    16:16:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1079:1079 -> c
-    17:17:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> c
-    17:17:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1079 -> c
+    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1080 -> c
+    16:16:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1081:1081 -> c
+    17:17:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> c
+    17:17:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1081 -> c
     1:4:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):383:386 -> d
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> d
     5:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):386 -> d
     6:6:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):394:394 -> d
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> d
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> d
     7:7:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):394 -> d
     8:20:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):394:406 -> d
     21:21:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():290:290 -> d
@@ -30261,78 +30245,87 @@
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> b
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():55:55 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):63:63 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):61:65 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):64:64 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):61:66 -> <init>
     long lambda$getChecksumSupplier$0(long,com.android.tools.r8.graph.DexProgramClass) -> a
-    1:8:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):69:76 -> a
-    9:20:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):288:299 -> a
-    9:20:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):77 -> a
-    21:33:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):83:95 -> a
-    34:36:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):94:96 -> a
+    1:8:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):70:77 -> a
+    9:20:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):307:318 -> a
+    9:20:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):78 -> a
+    21:33:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):84:96 -> a
+    34:36:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):95:97 -> a
     37:37:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
-    37:37:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):96 -> a
-    38:40:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):98:100 -> a
-    41:42:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):87:88 -> a
-    43:43:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    43:43:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    43:43:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):88 -> a
-    44:44:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):88:88 -> a
-    45:46:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):78:79 -> a
-    47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    47:47:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):79 -> a
-    48:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):79:79 -> a
-    49:60:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):318:329 -> a
-    49:60:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
-    61:63:com.android.tools.r8.graph.DexClass definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):308:310 -> a
-    61:63:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):329 -> a
-    61:63:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
-    64:64:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    64:64:com.android.tools.r8.graph.DexClass definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):310 -> a
-    64:64:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):329 -> a
-    64:64:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
-    65:71:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):330:336 -> a
-    65:71:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
-    72:91:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):105:124 -> a
-    92:95:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):352:355 -> a
-    92:95:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
-    96:101:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):126:131 -> a
-    102:102:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
-    102:102:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):131 -> a
-    103:121:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):130:148 -> a
-    122:124:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):147:149 -> a
-    125:125:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
-    125:125:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):149 -> a
-    126:128:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):149:151 -> a
-    129:130:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):144:145 -> a
-    131:131:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    131:131:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    131:131:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):145 -> a
-    132:143:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):145:156 -> a
-    144:144:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):353:353 -> a
-    144:144:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
-    145:163:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):160:178 -> a
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):697:697 -> a
-    164:164:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):178 -> a
-    165:186:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):179:200 -> a
-    187:191:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):204:208 -> a
-    192:216:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):212:236 -> a
-    217:217:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):740:740 -> a
-    217:217:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):236 -> a
-    218:229:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):238:249 -> a
-    230:230:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
-    230:230:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):249 -> a
-    231:232:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):252:253 -> a
-    233:287:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):229:283 -> a
-    288:292:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):343:347 -> a
+    37:37:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):97 -> a
+    38:41:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):99:102 -> a
+    42:43:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):88:89 -> a
+    44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    44:44:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):89 -> a
+    45:45:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):89:89 -> a
+    46:47:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):79:80 -> a
+    48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    48:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):80 -> a
+    49:49:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):80:80 -> a
+    50:61:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):337:348 -> a
+    50:61:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):106 -> a
+    62:64:com.android.tools.r8.graph.DexClass definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):327:329 -> a
+    62:64:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):348 -> a
+    62:64:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):106 -> a
+    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    65:65:com.android.tools.r8.graph.DexClass definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):329 -> a
+    65:65:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):348 -> a
+    65:65:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):106 -> a
+    66:72:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):349:355 -> a
+    66:72:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):106 -> a
+    73:92:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):107:126 -> a
+    93:96:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):371:374 -> a
+    93:96:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):127 -> a
+    97:108:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):128:139 -> a
+    109:109:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
+    109:109:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):139 -> a
+    110:128:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):141:159 -> a
+    129:131:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):158:160 -> a
+    132:132:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
+    132:132:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):160 -> a
+    133:135:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):168:170 -> a
+    136:137:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):155:156 -> a
+    138:138:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    138:138:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    138:138:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):156 -> a
+    139:158:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):156:175 -> a
+    159:159:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):372:372 -> a
+    159:159:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):127 -> a
+    160:178:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):179:197 -> a
+    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):697:697 -> a
+    179:179:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):197 -> a
+    180:201:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):198:219 -> a
+    202:206:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):223:227 -> a
+    207:231:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):231:255 -> a
+    232:232:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):740:740 -> a
+    232:232:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):255 -> a
+    233:244:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):257:268 -> a
+    245:245:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
+    245:245:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):268 -> a
+    246:247:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):271:272 -> a
+    248:302:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set) -> a
+    303:307:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):362:366 -> a
 com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense -> com.android.tools.r8.t.c.r$a:
-    1:1:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):370:370 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense$Builder builder():386:386 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):382:382 -> mapInvocationType
+    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):389:389 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense$Builder builder():405:405 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):401:401 -> mapInvocationType
 com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense$Builder -> com.android.tools.r8.t.c.q:
-    1:1:void <init>():389:389 -> <init>
-    1:4:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):392:395 -> a
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.t.c.s:
+    1:1:void <init>():408:408 -> <init>
+    1:4:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):411:414 -> a
+com.android.tools.r8.ir.desugar.LambdaAccessorMethodWithSynthesizedCode -> com.android.tools.r8.t.c.s:
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):15:15 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):20:20 -> a
+    1:15:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):26:40 -> b
+    16:16:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):37:37 -> b
+    17:17:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):33:33 -> b
+    18:18:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):30:30 -> b
+    1:1:java.util.function.Consumer getRegistryCallback():25:25 -> getRegistryCallback
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():20:20 -> getSourceCodeProvider
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.t.c.t:
     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
@@ -30344,7 +30337,7 @@
     2:2:void prepareInstructions():30 -> h
     3:18:void prepareInstructions():30:45 -> h
     19:46:void prepareInstructions():44:71 -> h
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSynthesizedCode -> com.android.tools.r8.t.c.t:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSynthesizedCode -> com.android.tools.r8.t.c.u:
     com.android.tools.r8.graph.DexMethod bridgeMethod -> f
     com.android.tools.r8.graph.DexMethod mainMethod -> e
     1:3:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):19:21 -> <init>
@@ -30367,142 +30360,154 @@
     com.android.tools.r8.graph.DexMethod classConstructor -> e
     com.android.tools.r8.graph.DexMethod constructor -> d
     java.util.Collection synthesizedFrom -> i
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):79:79 -> <init>
-    2:37:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):70:105 -> <init>
-    1:1:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):111:111 -> a
-    2:22:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):116:136 -> a
-    2:22:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):111 -> a
-    23:28:com.android.tools.r8.graph.DexField getCaptureField(int):199:204 -> a
-    29:29:com.android.tools.r8.graph.DexField getCaptureField(int):201:201 -> a
-    30:37:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):212:219 -> a
-    38:38:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):340:340 -> a
-    39:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):363:385 -> a
-    39:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341 -> a
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):80:80 -> <init>
+    2:37:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):71:106 -> <init>
+    1:1:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):112:112 -> a
+    2:22:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):117:137 -> a
+    2:22:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):112 -> a
+    23:28:com.android.tools.r8.graph.DexField getCaptureField(int):200:205 -> a
+    29:29:com.android.tools.r8.graph.DexField getCaptureField(int):202:202 -> a
+    30:37:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):213:220 -> a
+    38:38:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341:341 -> a
+    39:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):364:386 -> a
+    39:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
     62:62:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):385 -> a
-    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341 -> a
-    63:86:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):385:408 -> a
-    63:86:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341 -> a
-    87:87:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):407:407 -> a
-    87:87:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341 -> a
-    88:88:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):402:402 -> a
-    88:88:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341 -> a
-    89:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):345:358 -> a
-    103:104:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):415:416 -> a
-    103:104:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):356 -> a
-    105:131:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):415:441 -> a
-    105:131:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):356 -> a
-    132:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):447:462 -> a
-    132:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):353 -> a
-    148:152:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):459:463 -> a
-    148:152:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):353 -> a
-    153:173:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):469:489 -> a
-    153:173:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):351 -> a
-    174:176:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):494:496 -> a
-    174:176:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):349 -> a
-    177:177:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):347:347 -> a
-    178:180:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():500:502 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():140:140 -> b
-    2:10:long computeChecksumForSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):187:195 -> b
-    1:1:boolean isStateless():208:208 -> c
+    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):386 -> a
+    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
+    63:86:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):386:409 -> a
+    63:86:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
+    87:87:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):408:408 -> a
+    87:87:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
+    88:88:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):403:403 -> a
+    88:88:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
+    89:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):346:359 -> a
+    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):416:416 -> a
+    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):357 -> a
+    108:131:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):419:442 -> a
+    108:131:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):357 -> a
+    132:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):448:463 -> a
+    132:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):354 -> a
+    148:152:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):460:464 -> a
+    148:152:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):354 -> a
+    153:173:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):470:490 -> a
+    153:173:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> a
+    174:176:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):495:497 -> a
+    174:176:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):350 -> a
+    177:177:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):348:348 -> a
+    178:180:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():501:503 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():141:141 -> b
+    2:10:long computeChecksumForSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):188:196 -> b
+    1:1:boolean isStateless():209:209 -> c
     2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():180:180 -> c
-    2:2:boolean isStateless():208 -> c
-    1:13:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():144:156 -> d
-    14:17:com.android.tools.r8.graph.DexTypeList buildInterfaces():331:334 -> d
-    14:17:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():157 -> d
-    18:24:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():157:163 -> d
-    25:40:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():309:324 -> d
-    25:40:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():164 -> d
-    41:49:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():294:302 -> d
-    41:49:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():165 -> d
-    50:62:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():261:273 -> d
-    50:62:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> d
+    2:2:boolean isStateless():209 -> c
+    1:13:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():145:157 -> d
+    14:17:com.android.tools.r8.graph.DexTypeList buildInterfaces():332:335 -> d
+    14:17:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():158 -> d
+    18:24:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():158:164 -> d
+    25:40:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():310:325 -> d
+    25:40:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():165 -> d
+    41:49:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():295:303 -> d
+    41:49:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> d
+    50:62:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():262:274 -> d
+    50:62:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
     63:63:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> d
-    63:63:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():273 -> d
-    63:63:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> d
-    64:76:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():273:285 -> d
-    64:76:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> d
+    63:63:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():274 -> d
+    63:63:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
+    64:76:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():274:286 -> d
+    64:76:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
     77:77:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> d
-    77:77:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():285 -> d
-    77:77:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> d
-    78:78:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():285:285 -> d
-    78:78:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> d
-    79:89:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):224:234 -> d
-    79:89:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
+    77:77:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():286 -> d
+    77:77:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
+    78:78:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():286:286 -> d
+    78:78:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
+    79:89:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):225:235 -> d
+    79:89:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
     90:90:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> d
-    90:90:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):234 -> d
-    90:90:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
-    91:109:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):234:252 -> d
-    91:109:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
+    90:90:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):235 -> d
+    90:90:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
+    91:109:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):235:253 -> d
+    91:109:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
     110:110:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> d
-    110:110:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):252 -> d
-    110:110:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
-    111:111:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):252:252 -> d
-    111:111:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
-    112:121:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167:176 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.t.c.u:
+    110:110:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):253 -> d
+    110:110:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
+    111:111:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):253:253 -> d
+    111:111:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
+    112:121:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168:177 -> d
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.t.c.v:
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
-    1:1:void <clinit>():699:699 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):701:702 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():708:708 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):540:540 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():708 -> a
-    3:16:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():709:722 -> a
+    1:1:void <clinit>():737:737 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):739:740 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):746:746 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):541:541 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):746 -> a
+    3:16:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):747:760 -> a
     17:17:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():722 -> a
-    18:20:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():729:731 -> a
-    21:21:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):725:725 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.t.c.v:
-    com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):656:657 -> <init>
-    1:6:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():664:669 -> a
-    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():670 -> a
-    8:17:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():673:682 -> a
-    18:18:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():682 -> a
-    19:23:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():684:688 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.t.c.w:
+    17:17:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):760 -> a
+    18:20:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):765:767 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.t.c.w:
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
-    1:1:void <clinit>():604:604 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):606:607 -> <init>
-    1:6:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():614:619 -> a
+    1:1:void <clinit>():655:655 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):657:658 -> <init>
+    1:5:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):664:668 -> a
+    6:8:com.android.tools.r8.graph.DexEncodedMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):676:678 -> a
+    6:8:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):670 -> a
+    9:9:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):679 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):670 -> a
+    10:19:com.android.tools.r8.graph.DexEncodedMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):682:691 -> a
+    10:19:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):670 -> a
+    20:20:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):691 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):670 -> a
+    21:25:com.android.tools.r8.graph.DexEncodedMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):693:697 -> a
+    21:25:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):670 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):671:671 -> a
+    27:43:com.android.tools.r8.graph.DexEncodedMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):708:724 -> a
+    44:44:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):724 -> a
+    45:45:com.android.tools.r8.graph.DexEncodedMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):730:730 -> a
+    46:46:void lambda$createSyntheticAccessor$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):727:727 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.t.c.x:
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
+    1:1:void <clinit>():605:605 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):607:608 -> <init>
+    1:6:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):615:620 -> a
     7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():620 -> a
-    8:20:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():623:635 -> a
+    7:7:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):621 -> a
+    8:20:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):624:636 -> a
     21:21:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
-    21:21:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():635 -> a
-    22:26:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():637:641 -> a
-    27:35:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():640:648 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.t.c.x:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):572:572 -> <init>
-    com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.t.c.y:
+    21:21:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):636 -> a
+    22:26:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):638:642 -> a
+    27:35:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):641:649 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.t.c.y:
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):573:573 -> <init>
+    com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean) -> a
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.t.c.z:
     com.android.tools.r8.graph.ProgramMethod target -> g
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):587:588 -> <init>
-    1:3:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility():594:596 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.t.c.z:
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):588:589 -> <init>
+    1:3:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean):595:597 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.t.c.A$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexEncodedMethod accessibilityBridge -> d
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     com.android.tools.r8.graph.DexMethod callTarget -> a
     boolean hasEnsuredAccessibility -> c
-    1:1:void <clinit>():508:508 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):516:520 -> <init>
-    com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility() -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):536:536 -> a
-    1:5:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibilityIfNeeded():528:532 -> b
+    1:1:void <clinit>():509:509 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):517:521 -> <init>
+    com.android.tools.r8.graph.DexEncodedMethod ensureAccessibility(boolean) -> a
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):537:537 -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod ensureAccessibilityIfNeeded(boolean):529:533 -> b
 com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.t.c.B:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:19 -> <init>
     1:1:void lambda$prepareInstructions$0(int,com.android.tools.r8.ir.conversion.IRBuilder):26:26 -> b
-    1:6:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:34 -> c
-    7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
+    1:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> d
     1:17:void prepareInstructions():25:41 -> h
 com.android.tools.r8.ir.desugar.LambdaClassConstructorSynthesizedCode -> com.android.tools.r8.t.c.C:
@@ -30587,7 +30592,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):446:446 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):447:447 -> 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
@@ -30595,26 +30600,26 @@
     60:60:void lambda$prepareInstructions$0(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):199:199 -> a
     61:61:void lambda$prepareInstructions$1(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.IRBuilder):215:215 -> a
     62:62:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
-    63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():544:544 -> a
+    63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():545:545 -> a
     63:63:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():545 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():546 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():554:554 -> a
+    65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():555:555 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():554 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
+    66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():555 -> 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:74:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():554:561 -> a
+    67:74:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():555:562 -> a
     67:74:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    75:81:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():558:564 -> a
+    75:81:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():559:565 -> a
     75:81:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     82:82:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
     83:88:int prepareReturnValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):261:266 -> a
     89:106:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     107:107:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     107:107:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):446:446 -> a
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):447:447 -> a
     108:108:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     108:108:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     109:150:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -30663,184 +30668,143 @@
 com.android.tools.r8.ir.desugar.LambdaMainMethodSynthesizedCode -> com.android.tools.r8.t.c.H:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod mainMethod -> e
-    1:1:void <clinit>():14:14 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):19:20 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):25:25 -> a
-    1:28:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):31:58 -> b
-    29:29:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):52:52 -> b
-    30:30:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):49:49 -> b
-    31:31:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):46:46 -> b
-    1:1:java.util.function.Consumer getRegistryCallback():30:30 -> getRegistryCallback
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():25:25 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.t.c.J:
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):20:21 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):26:26 -> a
+    1:31:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):32:62 -> b
+    32:32:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):56:56 -> b
+    33:33:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):53:53 -> b
+    34:34:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):50:50 -> b
+    1:1:java.util.function.Consumer getRegistryCallback():31:31 -> getRegistryCallback
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():26:26 -> getSourceCodeProvider
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.t.c.I:
     com.android.tools.r8.graph.DexString instanceFieldName -> b
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> d
-    boolean $assertionsDisabled -> g
-    java.util.Map knownCallSites -> e
-    com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense graphLens -> c
-    java.util.Map knownLambdaClasses -> f
-    1:1:void <clinit>():58:58 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):89:89 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView):71:94 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor access$000(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):58:58 -> a
-    2:2:com.android.tools.r8.ir.desugar.LambdaClass access$100(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):58:58 -> a
-    3:3:com.android.tools.r8.graph.AppInfoWithClassHierarchy getAppInfo():102:102 -> a
-    4:5:void lambda$synthesizeLambdaClassesForWave$0(java.util.Set,java.util.Set,com.android.tools.r8.ir.desugar.LambdaClass):126:127 -> a
-    6:26:void synthesizeAccessibilityBridgesForLambdaClasses(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):173:193 -> a
-    27:39:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:246 -> a
-    40:40:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    40:40:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):253 -> a
-    41:41:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):253:253 -> a
-    42:43:com.android.tools.r8.ir.desugar.LambdaClass getKnownLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):394:395 -> a
-    42:43:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    44:45:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):255:256 -> a
-    46:58: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):441:453 -> a
-    46:58:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    59:59:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    59:59: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):453 -> a
-    59:59:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    60:60: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):452:452 -> a
-    60:60:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
-    61:61: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):451 -> a
-    61:61:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    62: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):455:482 -> a
-    62:89:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    90:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.asDefinitelyNotNull():83:83 -> 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):482 -> a
-    90:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    91:99: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):481:489 -> a
-    91:99:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    100:100:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37:37 -> a
-    100:100: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):489 -> a
-    100:100:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    101:115: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):491:505 -> a
-    101:115:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    116:116:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    116: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):506 -> a
-    116:116:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    117:117: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):506:506 -> a
-    117:117:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    118:118:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.asDefinitelyNotNull():83:83 -> a
-    118:118: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):482 -> a
-    118:118:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    119:120:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):265:266 -> a
-    121:121:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    121:121:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):266 -> a
-    122:122:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    122:122:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):266 -> a
-    123:125:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):266:268 -> a
-    126:133:boolean removeLambdaDeserializationMethods(java.lang.Iterable):273:280 -> a
-    134:134:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    134:134:com.android.tools.r8.graph.DexItemFactory getFactory():106 -> a
-    134:134:boolean removeLambdaDeserializationMethods(java.lang.Iterable):281 -> a
-    135:135:com.android.tools.r8.graph.DexItemFactory getFactory():106:106 -> a
-    135:135:boolean removeLambdaDeserializationMethods(java.lang.Iterable):281 -> a
-    136:136:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    136:136:boolean removeLambdaDeserializationMethods(java.lang.Iterable):281 -> a
-    137:139:boolean removeLambdaDeserializationMethods(java.lang.Iterable):282:284 -> a
-    140:141:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):299:300 -> a
-    142:142:void synthesizeAccessibilityBridgesForLambdaClasses(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):162:162 -> a
-    142:142:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):299 -> a
-    143:148:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):301:306 -> a
-    149:152:void optimizeSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):311:314 -> a
-    153:153:void optimizeSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):311:311 -> a
-    154:159:void finalizeLambdaDesugaringForR8(com.android.tools.r8.graph.DexApplication$Builder):321:326 -> a
-    160:166:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):345:351 -> a
-    167:173:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):422:428 -> a
-    167:173:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):348 -> a
-    174:174:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):348:348 -> a
-    175:175:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):429:429 -> a
-    175:175:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):348 -> a
-    176:180:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):361:365 -> a
-    181:187:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):422:428 -> a
-    181:187:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):366 -> a
-    188:188:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):366:366 -> a
-    189:189:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    189:189:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):370 -> a
-    190:190:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):370:370 -> a
-    191:191:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    191:191:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):370 -> a
-    192:192:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    192:192:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):372 -> a
-    193:193:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):372:372 -> a
-    194:194:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    194:194:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):375 -> a
-    195:198:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):376:379 -> a
-    199:204:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):399:404 -> a
-    199:204:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):382 -> a
-    205:205:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    205:205:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):405 -> a
-    205:205:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):382 -> a
-    206:206:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):405:405 -> a
-    206:206:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):382 -> a
-    207:207:com.android.tools.r8.graph.DexItemFactory getFactory():106:106 -> a
-    207:207:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):409 -> a
-    207:207:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):382 -> a
-    208:211:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):409:412 -> a
-    208:211:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):382 -> a
-    212:212:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):411:411 -> a
-    212:212:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):382 -> a
-    213:213:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):410:410 -> a
-    213:213:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):382 -> a
-    214:214:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):407:407 -> a
-    214:214:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):382 -> a
-    215:215:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):429:429 -> a
-    215:215:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):366 -> a
-    216:216:com.android.tools.r8.graph.AppView getAppView():98:98 -> a
-    216:216:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):386 -> a
-    217:217:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    217:217:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):386 -> a
-    218:218:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):386:386 -> a
-    219:219:boolean isInMainDexList(com.android.tools.r8.graph.DexType):355:355 -> a
-    219:219:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):387 -> a
-    220:220:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):388:388 -> a
-    221:223:java.lang.Object getKnown(java.util.Map,java.lang.Object):416:418 -> a
-    1:1:com.android.tools.r8.graph.AppView getAppView():98:98 -> b
-    2:5:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):120:123 -> b
-    6:19:void synthesizeLambdaClassesForMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer,com.android.tools.r8.ir.conversion.LensCodeRewriter):199:212 -> b
-    6:19:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):123 -> b
-    20:20:com.android.tools.r8.graph.AppView getAppView():98:98 -> b
-    20:20:com.android.tools.r8.graph.DexItemFactory getFactory():106 -> b
-    20:20:void synthesizeLambdaClassesForMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer,com.android.tools.r8.ir.conversion.LensCodeRewriter):214 -> b
-    20:20:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):123 -> b
-    21:21:com.android.tools.r8.graph.DexItemFactory getFactory():106:106 -> b
-    21:21:void synthesizeLambdaClassesForMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer,com.android.tools.r8.ir.conversion.LensCodeRewriter):214 -> b
-    21:21:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):123 -> b
-    22:22:void synthesizeLambdaClassesForMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer,com.android.tools.r8.ir.conversion.LensCodeRewriter):214:214 -> b
-    22:22:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):123 -> b
-    23:23:void synthesizeLambdaClassesForMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer,com.android.tools.r8.ir.conversion.LensCodeRewriter):212:212 -> b
-    23:23:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):123 -> b
-    24:38:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):132:146 -> b
-    39:39:com.android.tools.r8.graph.AppView getAppView():98:98 -> b
-    39:39:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):151 -> b
-    40:42:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):151:153 -> b
-    43:47:void synthesizeLambdaClassesForWave(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.LensCodeRewriter):152:156 -> b
-    1:3:java.util.Set getDesugaredCallSites():331:333 -> c
-    1:1:com.android.tools.r8.graph.AppView getAppView():98:98 -> d
-    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():106 -> d
-    2:2:com.android.tools.r8.graph.DexItemFactory getFactory():106:106 -> d
-    1:1:void installGraphLens():110:110 -> e
-com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.t.c.I:
-    com.android.tools.r8.ir.conversion.LensCodeRewriter val$lensCodeRewriter -> a
-    java.util.function.Consumer val$consumer -> c
-    com.android.tools.r8.ir.desugar.LambdaRewriter this$0 -> d
-    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,java.util.function.Consumer):214:214 -> <init>
-    1:3:void registerCallSite(com.android.tools.r8.graph.DexCallSite):218:220 -> registerCallSite
-    4:7:void registerCallSite(com.android.tools.r8.graph.DexCallSite):219:222 -> registerCallSite
-com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.t.c.K:
-    boolean shouldMapInvocationType -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.AppView):26:32 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.AppView):25:25 -> <init>
-    9:9:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
-    1:1:void addOriginalMethodSignatures(java.util.Map):41:41 -> a
-    1:1:void markShouldMapInvocationType():45:45 -> b
-    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):51:53 -> mapInvocationType
-com.android.tools.r8.ir.desugar.LambdaSynthesizedCode -> com.android.tools.r8.t.c.L:
+    java.util.Map knownCallSites -> d
+    com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> c
+    boolean $assertionsDisabled -> f
+    java.util.Map knownLambdaClasses -> e
+    1:1:void <clinit>():52:52 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):82:82 -> <init>
+    2:24:void <init>(com.android.tools.r8.graph.AppView):64:86 -> <init>
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy getAppInfo():94:94 -> a
+    2:13:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:148 -> a
+    14:20:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):236:242 -> a
+    14:20:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148 -> a
+    21:27:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):313:319 -> a
+    21:27:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):239 -> a
+    21:27:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148 -> a
+    28:28:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):239:239 -> a
+    28:28:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148 -> a
+    29:29:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):149:149 -> a
+    30:30:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    30:30:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):156 -> a
+    31:31:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):156:156 -> a
+    32:33:com.android.tools.r8.ir.desugar.LambdaClass getKnownLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):285:286 -> a
+    32:33:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):157 -> a
+    34:35:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):158:159 -> a
+    36:48:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):332:344 -> a
+    36:48:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    49:49:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    49:49:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):344 -> a
+    49:49:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    50:50:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):343:343 -> a
+    50:50:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    51:51:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
+    51:51:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):342 -> a
+    51:51:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    52:79:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):346:373 -> a
+    52:79:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    80:80:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.asDefinitelyNotNull():83:83 -> a
+    80:80: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):373 -> a
+    80:80:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    81: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):372:380 -> a
+    81:89:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> 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):37:37 -> 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):380 -> a
+    90:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    91:105:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):382:396 -> a
+    91:105:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    106:106:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    106:106: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):397 -> a
+    106:106:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    107:107: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):397:397 -> a
+    107:107:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    108:108:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.asDefinitelyNotNull():83:83 -> a
+    108:108: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):373 -> a
+    108:108:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164 -> a
+    109:109:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):320:320 -> a
+    109:109:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):239 -> a
+    109:109:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148 -> a
+    110:111:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):168:169 -> a
+    112:112:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    112:112:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):169 -> a
+    113:113:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    113:113:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):169 -> a
+    114:116:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):169:171 -> a
+    117:124:boolean removeLambdaDeserializationMethods(java.lang.Iterable):176:183 -> a
+    125:125:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    125:125:com.android.tools.r8.graph.DexItemFactory getFactory():98 -> a
+    125:125:boolean removeLambdaDeserializationMethods(java.lang.Iterable):184 -> a
+    126:126:com.android.tools.r8.graph.DexItemFactory getFactory():98:98 -> a
+    126:126:boolean removeLambdaDeserializationMethods(java.lang.Iterable):184 -> a
+    127:127:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    127:127:boolean removeLambdaDeserializationMethods(java.lang.Iterable):184 -> a
+    128:130:boolean removeLambdaDeserializationMethods(java.lang.Iterable):185:187 -> a
+    131:132:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):202:203 -> a
+    133:142:void synthesizeAccessibilityBridgesForLambdaClassesD8(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):118:127 -> a
+    133:142:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):202 -> a
+    143:148:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):204:209 -> a
+    149:153:void optimizeSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):214:214 -> a
+    154:158:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):252:256 -> a
+    159:165:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):313:319 -> a
+    159:165:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):257 -> a
+    166:166:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):257:257 -> a
+    167:167:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    167:167:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):261 -> a
+    168:168:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):261:261 -> a
+    169:169:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
+    169:169:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):261 -> a
+    170:170:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    170:170:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):263 -> a
+    171:171:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):263:263 -> a
+    172:172:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    172:172:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):266 -> a
+    173:176:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):267:270 -> a
+    177:182:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):290:295 -> a
+    177:182:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
+    183:183:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    183:183:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):296 -> a
+    183:183:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
+    184:184:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):296:296 -> a
+    184:184:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
+    185:185:com.android.tools.r8.graph.DexItemFactory getFactory():98:98 -> a
+    185:185:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):300 -> a
+    185:185:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
+    186:189:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):300:303 -> a
+    186:189:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
+    190:190:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):302:302 -> a
+    190:190:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
+    191:191:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):301:301 -> a
+    191:191:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
+    192:192:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):298:298 -> a
+    192:192:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
+    193:193:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):320:320 -> a
+    193:193:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):257 -> a
+    194:194:com.android.tools.r8.graph.AppView getAppView():90:90 -> a
+    194:194:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):277 -> a
+    195:195:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    195:195:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):277 -> a
+    196:196:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):277:277 -> a
+    197:197:boolean isInMainDexList(com.android.tools.r8.graph.DexType):246:246 -> a
+    197:197:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):278 -> a
+    198:198:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):279:279 -> a
+    199:201:java.lang.Object getKnown(java.util.Map,java.lang.Object):307:309 -> a
+    1:1:com.android.tools.r8.graph.AppView getAppView():90:90 -> b
+    1:1:com.android.tools.r8.graph.AppView getAppView():90:90 -> c
+    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():98 -> c
+    2:2:com.android.tools.r8.graph.DexItemFactory getFactory():98:98 -> c
+com.android.tools.r8.ir.desugar.LambdaSynthesizedCode -> com.android.tools.r8.t.c.J:
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():14:14 -> <clinit>
@@ -30848,7 +30812,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():28:28 -> a
     1:1:com.android.tools.r8.graph.DexType[] captures():32 -> a
     2:4:com.android.tools.r8.graph.DexType[] captures():32:34 -> a
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.t.c.M:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.t.c.K:
     java.util.Map bridges -> b
     java.util.Map getFieldBridges -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -30914,15 +30878,15 @@
     13:18:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):317:322 -> b
     19:20:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):235:236 -> b
     19:20:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):322 -> b
-    21:23:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1309:1311 -> b
+    21:23: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):1337:1339 -> b
     21:23:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):236 -> b
     21:23:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):322 -> b
-    24:27:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1310:1313 -> b
+    24:27: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):1338:1341 -> b
     24:27:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):236 -> b
     24:27:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):322 -> b
     28:28:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):237:237 -> b
     28:28:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):322 -> b
-    29:29:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1309:1309 -> b
+    29:29: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):1337:1337 -> b
     29:29:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):236 -> b
     29:29:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):322 -> b
     30:37:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):324:331 -> b
@@ -30935,7 +30899,7 @@
     15:20:void processNest(com.android.tools.r8.graph.DexClass,java.util.List):136:141 -> c
     15:20:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):119 -> c
     void reportMissingNestHost(com.android.tools.r8.graph.DexClass) -> d
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.t.c.M$a:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.t.c.K$a:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):446:448 -> <init>
@@ -30954,7 +30918,7 @@
     2:2:boolean isGet():469:469 -> g
     2:2:boolean isStaticGet():485 -> g
     1:1:int hashCode():453:453 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.t.c.N:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.t.c.L:
     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
@@ -30987,40 +30951,40 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):381:381 -> registerInvokeVirtual
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):426:426 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):431:431 -> registerStaticFieldWrite
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.t.c.P:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.t.c.N:
     java.util.Map getFieldMap -> b
     java.util.Map putFieldMap -> c
     com.android.tools.r8.graph.DexType nestConstructorType -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():18:18 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):33:39 -> <init>
-    8:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):32:46 -> <init>
-    1:3:com.android.tools.r8.graph.DexMethod lookupFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,java.util.Map):51:53 -> a
-    4:9:boolean isConstructorBridge(com.android.tools.r8.graph.DexMethod):92:97 -> a
-    1:1:com.android.tools.r8.ir.desugar.NestedPrivateMethodLense$Builder builder():131:131 -> b
-    1:5:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):78:82 -> isContextFreeForMethod
-    1:1:boolean isContextFreeForMethods():73:73 -> isContextFreeForMethods
-    1:2:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):61:62 -> lookupGetFieldForMethod
-    1:14:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):114:127 -> 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.NestedPrivateMethodLense$Builder -> com.android.tools.r8.t.c.O:
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):34:40 -> <init>
+    8:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):33:47 -> <init>
+    1:3:com.android.tools.r8.graph.DexMethod lookupFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,java.util.Map):52:54 -> a
+    4:9:boolean isConstructorBridge(com.android.tools.r8.graph.DexMethod):93:98 -> a
+    1:1:com.android.tools.r8.ir.desugar.NestedPrivateMethodLense$Builder builder():132:132 -> b
+    1:5:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):79:83 -> isContextFreeForMethod
+    1:1:boolean isContextFreeForMethods():74:74 -> isContextFreeForMethods
+    1:2:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):62:63 -> lookupGetFieldForMethod
+    1:14:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):115:128 -> lookupMethod
+    1:6:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):103:108 -> lookupPrototypeChanges
+    1:2:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):68:69 -> lookupPutFieldForMethod
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense$Builder -> com.android.tools.r8.t.c.M:
     boolean $assertionsDisabled -> h
     java.util.Map getFieldMap -> f
     java.util.Map putFieldMap -> g
-    1:1:void <clinit>():134:134 -> <clinit>
-    1:4:void <init>():134:137 -> <init>
-    1:1:void mapGetField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):140:140 -> a
-    2:8:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):148:154 -> a
-    1:1:void mapPutField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):144:144 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.t.c.Q:
+    1:1:void <clinit>():135:135 -> <clinit>
+    1:4:void <init>():135:138 -> <init>
+    1:1:void mapGetField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):141:141 -> a
+    2:8:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149:155 -> a
+    1:1:void mapPutField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):145:145 -> b
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.t.c.O:
     1:1:void <init>():22:22 -> <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,com.android.tools.r8.graph.AppView):33:33 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):37:41 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.t.c.Q$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.t.c.O$a:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -31079,22 +31043,21 @@
     44:48:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):113 -> b
     49:49:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):157:157 -> b
     49:49:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):113 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.t.c.S:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.t.c.P:
     1:1:void <init>():181:181 -> <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,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.t.c.T:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.t.c.Q:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):34:34 -> <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):39:39 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1116 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1122 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39 -> a
-    3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39:40 -> a
-    5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39:39 -> a
+    3:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39:39 -> a
     6:22:void computeAndProcessNestsConcurrently(java.util.concurrent.ExecutorService):78:94 -> a
     6:22:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):41 -> a
     23:24:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):42:43 -> a
@@ -31105,7 +31068,7 @@
     33:39:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.function.BiConsumer):58:64 -> a
     40:43:void reportIncompleteNest(java.util.List):114:117 -> a
     1:4:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):105:108 -> d
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.t.c.Z:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.t.c.X:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -31136,10 +31099,8 @@
     26:41:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):141 -> a
     42:47: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):169:174 -> a
     42:47:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):141 -> a
-    48:49: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):162:163 -> a
-    48:49:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):141 -> a
-    50:50: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):162:162 -> a
-    50:50:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):141 -> a
+    48:50: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):162:162 -> a
+    48:50:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):141 -> a
     51:51:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):142:142 -> a
     52:101:void rewriteMakeConcatWithConstants(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):190:239 -> a
     52:101:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
@@ -31152,35 +31113,28 @@
     118:119:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
     120:120:void rewriteMakeConcatWithConstants(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):250:250 -> a
     120:120:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
-    121:122:java.lang.String convertToString(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexValue):279:280 -> a
-    121:122:void rewriteMakeConcatWithConstants(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):250 -> a
-    121:122:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
-    123:123:java.lang.String convertToString(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexValue):279:279 -> a
-    123:123:void rewriteMakeConcatWithConstants(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):250 -> a
-    123:123:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
+    121:123:java.lang.String convertToString(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexValue):279:279 -> a
+    121:123:void rewriteMakeConcatWithConstants(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):250 -> a
+    121:123:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
     124:152:void rewriteMakeConcatWithConstants(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):244:272 -> a
     124:152:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
-    153:154:void rewriteMakeConcatWithConstants(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):262:263 -> a
-    153:154:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
-    155:155:void rewriteMakeConcatWithConstants(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):262:262 -> a
-    155:155:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
+    153:155:void rewriteMakeConcatWithConstants(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):262:262 -> a
+    153:155:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
     156:156:void rewriteMakeConcatWithConstants(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):258:258 -> a
     156:156:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
     157:157:void rewriteMakeConcatWithConstants(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):217:217 -> a
     157:157:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
     158:158:void rewriteMakeConcatWithConstants(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):205:205 -> a
     158:158:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
-    159:160:void rewriteMakeConcatWithConstants(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):199:200 -> a
-    159:160:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
-    161:161:void rewriteMakeConcatWithConstants(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):199:199 -> a
-    161:161:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
+    159:161:void rewriteMakeConcatWithConstants(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):199:199 -> a
+    159:161:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):143 -> a
     162:164:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):456:458 -> a
     165:165:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     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.t.c.U:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.t.c.Y:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.t.c.S:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.t.c.W:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -31200,7 +31154,7 @@
     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):1045:1045 -> 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):1049:1049 -> 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
@@ -31211,35 +31165,32 @@
     19:20:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
     19:20:void desugar():347 -> a
     21:21:void desugar():351:351 -> a
-    22:24:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:415 -> a
-    22:24:void desugar():352 -> a
-    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
+    22:25:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
+    22: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):1045:1045 -> 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):1049:1049 -> a
     36:36:void desugar():365 -> a
-    37:38:void desugar():369:370 -> a
-    39:69:void desugar():369:399 -> a
+    37:39:void desugar():369:369 -> a
+    42:69:void desugar():372: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.t.c.V:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.t.c.T:
     com.android.tools.r8.ir.code.Value value -> c
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):423:424 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getOrCreateValue():429:429 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.t.c.W:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.t.c.U:
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.graph.DexMethod):406:407 -> <init>
     com.android.tools.r8.ir.code.Value getOrCreateValue() -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.t.c.X:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.t.c.V:
     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):1045:1045 -> 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):1049:1049 -> 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.t.c.a0:
+    4:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.t.c.Y:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> m
     com.android.tools.r8.graph.DexMethod currentMethod -> l
@@ -31254,7 +31205,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():33:33 -> j
     1:1:com.android.tools.r8.graph.DexItemFactory factory():43:43 -> k
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.t.c.b0:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.t.c.Z:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -31348,13 +31299,13 @@
     675:675:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):137 -> a
     676:704:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140:168 -> a
     705:705:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):165:165 -> a
-    706:706:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    706:706:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     706:706:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):82 -> a
     707:723:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):83:99 -> a
     724:724:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
     724:724:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):98 -> a
     725:725:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):102:102 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.t.c.c0.a:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.t.c.a0.a:
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1818:1847 -> A
     1:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5061:5078 -> A0
     19:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5075:5089 -> A0
@@ -32004,7 +31955,7 @@
     48:62:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036:5050 -> z0
     63:63:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047:5047 -> z0
     64:107:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5013:5056 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.t.c.c0.b:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.t.c.a0.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
@@ -32013,20 +31964,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.t.c.c0.c:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.t.c.a0.c:
     1:1:com.android.tools.r8.graph.CfCode generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
     2:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
     22:22:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
     23:39:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:69 -> a
     1:1:com.android.tools.r8.graph.CfCode generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.t.c.c0.d:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.t.c.a0.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.t.c.c0.e:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.t.c.a0.e:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     1:2:java.lang.Object com.android.tools.r8.utils.PredicateUtils.findFirst(java.lang.Object[],java.util.function.Predicate):12:13 -> a
     3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt.getExtensionOrNull(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12:12 -> a
@@ -32038,29 +31989,30 @@
     31:31:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):21:21 -> a
     32:32:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:14 -> a
     33:37:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
-    38:39:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
-    40:48:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt.singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):25:33 -> a
-    49:52:void com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteDoubleOrElseGet(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):26:29 -> a
-    53:53:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
-    54:54:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
-    55:55:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
-    56:58:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
-    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):50:51 -> a
-    61:63:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):56:58 -> a
-    64:64:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
-    65:65:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
-    66:66:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
-    67:74:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
-    75:81:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
-    82:83:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
-    84:93:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
-    94:101:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
-    102:104:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
-    105:108:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
-    109:114:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
-    115:123:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
-    124:126:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:72 -> a
-    127:127:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):971:971 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):22:22 -> a
+    39:40:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
+    41:49:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt.singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):25:33 -> a
+    50:53:void com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteDoubleOrElseGet(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):26:29 -> a
+    54:54:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
+    55:55:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
+    56:56:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
+    57:59:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
+    60:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):50:51 -> a
+    62:64:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):56:58 -> a
+    65:65:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
+    66:66:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
+    67:67:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
+    68:75:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
+    76:83:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    84:84:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:62 -> a
+    85:95:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    102:102:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):68:68 -> a
+    103:106:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    109:109:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):64:64 -> a
+    110:116:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    124:124:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):69:69 -> a
+    125:127:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:72 -> a
+    128:128:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):971:971 -> a
     boolean com.android.tools.r8.utils.NumberUtils.is32Bit(long) -> b
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
     3:6:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:21 -> b
@@ -32070,89 +32022,94 @@
     1:4:void com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteOrElseGet(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:21 -> e
     1:7:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> f
     1:6:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:24 -> g
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.t.c.c0.f:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.t.c.a0.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.t.c.c0.g:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.t.c.a0.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
     1:6:void rewriteToAddInstruction(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):23:28 -> b
     1:3:void rewriteToInvokeMath(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):15:17 -> c
     4:6:void rewriteToInvokeMath(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):16:18 -> c
-com.android.tools.r8.ir.optimize.AliasIntroducer -> com.android.tools.r8.ir.optimize.a:
-    com.android.tools.r8.graph.AppView appView -> a
-    1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
-    1:4:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):30:33 -> a
-    5:33:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):40:68 -> a
-    34:44:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):67:77 -> a
-    45:45:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.IRCode.findFirstNonNonePosition():1299:1299 -> a
-    45:45:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):78 -> a
-    46:49:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):79:82 -> a
-    50:50:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.IRCode.findFirstNonNonePosition():1299:1299 -> a
-    50:50:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):78 -> a
-    51:51:boolean lambda$insertAssumeNoneInstructionsInBlock$0(com.android.tools.r8.ir.code.Instruction):80:80 -> a
-    52:53:void lambda$insertAssumeNoneInstructionsInBlock$1(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Assume):83:84 -> a
-com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.ir.optimize.d:
+com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.ir.optimize.c:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation defaultTransformation -> c
     java.util.List configuration -> d
     boolean enabled -> e
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:15:void <init>(com.android.tools.r8.graph.AppView):81:95 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString lambda$new$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.AssertionsConfiguration):94:94 -> a
-    2:2:boolean isEnabled(com.android.tools.r8.utils.InternalOptions):101:101 -> a
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:15:void <init>(com.android.tools.r8.graph.AppView):82:96 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString lambda$new$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.AssertionsConfiguration):95:95 -> a
+    2:2:boolean isEnabled(com.android.tools.r8.utils.InternalOptions):102:102 -> a
     3:8:boolean com.android.tools.r8.utils.AssertionConfigurationWithDefault.isPassthroughAll():26:31 -> a
-    3:8:boolean isEnabled(com.android.tools.r8.utils.InternalOptions):102 -> a
-    9:9:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):220:220 -> a
-    10:29:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):106:125 -> a
-    10:29:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
-    30:53:boolean isDescriptorForClassOrInnerClass(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):146:169 -> a
-    30:53:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):125 -> a
-    30:53:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
-    54:58:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):126:130 -> a
-    54:58:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
-    59:60:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):113:114 -> a
-    59:60:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
-    61:66:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):448:453 -> a
-    61:66:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):114 -> a
-    61:66:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
-    67:70:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):115:118 -> a
-    67:70:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
-    71:94:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):110:133 -> a
-    71:94:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
-    95:104:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):224:233 -> a
-    105:105:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    105:105:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
-    106:108:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):237:239 -> a
-    109:109:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
-    109:109:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):244 -> a
-    110:114:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245:249 -> a
-    115:115:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
-    115:115:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250 -> a
-    116:116:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
-    116:116:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250 -> a
-    117:126:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252:261 -> a
-    127:127:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
-    127:127:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    128:128:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
-    128:128:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260 -> a
-com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.ir.optimize.b:
-com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.ir.optimize.c:
+    3:8:boolean isEnabled(com.android.tools.r8.utils.InternalOptions):103 -> a
+    9:10:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):221:222 -> a
+    11:30:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):107:126 -> a
+    11:30:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):229 -> a
+    11:30:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    31:54:boolean isDescriptorForClassOrInnerClass(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):147:170 -> a
+    31:54:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):126 -> a
+    31:54:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):229 -> a
+    31:54:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    55:59:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):127:131 -> a
+    55:59:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):229 -> a
+    55:59:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    60:61:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
+    60:61:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):229 -> a
+    60:61:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    62:67:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):448:453 -> a
+    62:67:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):115 -> a
+    62:67:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):229 -> a
+    62:67:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    68:71:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):116:119 -> a
+    68:71:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):229 -> a
+    68:71:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    72:95:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):111:134 -> a
+    72:95:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):229 -> a
+    72:95:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    96:105:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):230:239 -> a
+    96:105:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    106:106:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    106:106:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):239 -> a
+    106:106:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    107:109:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):243:245 -> a
+    107:109:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    110:110:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
+    110:110:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250 -> a
+    110:110:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    111:115:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):251:255 -> a
+    111:115:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    116:116:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> a
+    116:116:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    116:116:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    117:117:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
+    117:117:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    117:117:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    118:127:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):258:267 -> a
+    118:127:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    128:128:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> a
+    128:128:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):267 -> a
+    128:128:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    129:129:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
+    129:129:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):266 -> a
+    129:129:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):223 -> a
+    130:130:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):224:224 -> a
+com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.ir.optimize.a:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.ir.optimize.b:
     com.android.tools.r8.graph.DexString value -> b
     com.android.tools.r8.AssertionsConfiguration entry -> a
-    1:1:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.AssertionsRewriter$1):31:31 -> <init>
-    2:26:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):37:61 -> <init>
-    27:40:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):57:70 -> <init>
-    41:49:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory) -> <init>
-    50:72:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):45:67 -> <init>
-    1:1:com.android.tools.r8.AssertionsConfiguration access$000(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):31:31 -> a
-    1:1:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):31:31 -> b
-com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover -> com.android.tools.r8.ir.optimize.e:
+    1:1:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.AssertionsRewriter$1):32:32 -> <init>
+    2:26:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):38:62 -> <init>
+    27:40:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):58:71 -> <init>
+    41:49:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):42:50 -> <init>
+    50:72:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):46:68 -> <init>
+    1:1:com.android.tools.r8.AssertionsConfiguration access$000(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):32:32 -> a
+    1:1:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):32:32 -> b
+com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover -> com.android.tools.r8.ir.optimize.d:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> c
     java.util.Set assumeDynamicTypeInstructionsToRemove -> d
@@ -32172,10 +32129,10 @@
     35:35:void finish():106 -> a
     36:36:void finish():106:106 -> a
     1:1:boolean mayHaveIntroducedTrivialPhi():48:48 -> b
-com.android.tools.r8.ir.optimize.Assumer -> com.android.tools.r8.ir.optimize.f:
+com.android.tools.r8.ir.optimize.Assumer -> com.android.tools.r8.ir.optimize.e:
     void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate) -> a
     1:1:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode):18:18 -> a
-com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.ir.optimize.g:
+com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.ir.optimize.f:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     int[] hashes -> b
     boolean $assertionsDisabled -> c
@@ -32194,7 +32151,7 @@
     1:1:int doHash(java.lang.Object):16:16 -> doHash
     2:8:int doHash(com.android.tools.r8.ir.code.BasicBlock):79:85 -> doHash
     2:8:int doHash(java.lang.Object):16 -> doHash
-com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator -> com.android.tools.r8.ir.optimize.i:
+com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator -> com.android.tools.r8.ir.optimize.h:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set revisitedMethods -> b
     boolean $assertionsDisabled -> d
@@ -32207,123 +32164,135 @@
     47:53:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):117:123 -> a
     54:55:boolean hasLibraryOverrides(java.util.Collection):132:133 -> a
     56:61:boolean isLibraryMethodOrLibraryMethodOverride(com.android.tools.r8.graph.DexEncodedMethod):142:147 -> a
-    62:63:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):157:158 -> a
-    64:76:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):168:180 -> a
-    64:76:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):162 -> a
-    77:87:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):178:188 -> a
-    77:87:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):162 -> a
-    88:99:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):186:197 -> a
-    88:99:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):162 -> a
-    100:100:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):169:169 -> a
-    100:100:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):162 -> a
-    101:101:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):162:162 -> a
-    102:102:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):161:161 -> a
-    103:155:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):204:256 -> a
-    156:156:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
-    156:156:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):256 -> a
-    157:172:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):257:272 -> a
-    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
-    173:173:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):271 -> a
-    174:195:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):273:294 -> a
-    196:196:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    196:196:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):294 -> a
-    197:197:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):294:294 -> a
-    198:220:java.util.Set methodsToRevisit():300:322 -> a
+    62:66:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):157:161 -> a
+    67:79:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):171:183 -> a
+    67:79:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):165 -> a
+    80:90:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):181:191 -> a
+    80:90:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):165 -> a
+    91:102:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):189:200 -> a
+    91:102:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):165 -> a
+    103:103:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):172:172 -> a
+    103:103:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):165 -> a
+    104:104:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):165:165 -> a
+    105:105:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):164:164 -> a
+    106:158:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207:259 -> a
+    159:159:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
+    159:159:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):259 -> a
+    160:175:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):260:275 -> a
+    176:176:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
+    176:176:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):274 -> a
+    177:198:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):276:297 -> a
+    199:199:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    199:199:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):297 -> a
+    200:200:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):297:297 -> a
+    201:223:java.util.Set methodsToRevisit():303:325 -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
     1:6:void logResults():63:68 -> c
     7:7:void logResults():67:67 -> c
-com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.ir.optimize.h:
+com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.ir.optimize.g:
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode COLLECT -> a
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
     1:3:void <clinit>():44:46 -> <clinit>
     1:1:void <init>(java.lang.String,int):43:43 -> <init>
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.ir.optimize.k:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.ir.optimize.i:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> d
     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
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> 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
-    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> 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
-    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
-    105:105:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():74:74 -> 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():965:965 -> 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():965:965 -> 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):96:96 -> 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():867:871 -> 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:657:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):404:456 -> a
-    658:688:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):426:456 -> a
-    689:713:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):432:456 -> a
-    714:721:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):451:458 -> a
-    722:722:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):456:456 -> a
-    723:723:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$2(com.android.tools.r8.graph.DexField):420:420 -> a
-    724:725:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):483:484 -> a
-    726:734:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):501:509 -> a
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):131:131 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):129:134 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):62:62 -> a
+    2:10:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:146 -> a
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    11:11:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):146 -> a
+    12:37:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148:173 -> a
+    38:62:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):296:320 -> a
+    38:62:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):173 -> a
+    63:63:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):324:324 -> a
+    63:63:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):320 -> a
+    63:63:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):173 -> a
+    64:64:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    64:64:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):324 -> a
+    64:64:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):320 -> a
+    64:64:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):173 -> a
+    65:99:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):326:360 -> a
+    65:99:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):320 -> a
+    65:99:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):173 -> a
+    100:100: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
+    100:100:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):360 -> a
+    100:100:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):320 -> a
+    100:100:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):173 -> a
+    101:103:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):360:362 -> a
+    101:103:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):320 -> a
+    101:103:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):173 -> a
+    104:104:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):173:173 -> a
+    105:105:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):362:362 -> a
+    105:105:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):320 -> a
+    105:105:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):173 -> a
+    106:114:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):174:182 -> a
+    115:115:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():74:74 -> a
+    115:115:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):183 -> a
+    116:132:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):183:199 -> a
+    133:165:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175:207 -> a
+    166:166:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
+    166:166:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):211 -> a
+    167:193:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):212:238 -> a
+    194:194:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
+    194:194:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):239 -> a
+    195:195:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):239:239 -> a
+    196:196:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):96:96 -> a
+    196:196:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):239 -> a
+    197:244:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245:292 -> a
+    245:245:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:139 -> a
+    246:246:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.graph.DexEncodedField):257:257 -> a
+    247:248:void lambda$optimize$1():278:279 -> a
+    249:249:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):368:368 -> a
+    250:250:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    250:250:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):370 -> a
+    251:251:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    251:251:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):371 -> a
+    252:373:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):372:493 -> a
+    374:481:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):386:493 -> a
+    482:580:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):395:493 -> a
+    581:583:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402:404 -> a
+    584:585:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):458:459 -> a
+    584:585:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):405 -> a
+    586:586:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):406:406 -> a
+    587:591:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():868:872 -> a
+    587:591:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):411 -> a
+    592:610:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):414:432 -> a
+    611:618:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):527:534 -> a
+    611:618:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):439 -> a
+    619:671:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):441:493 -> a
+    672:702:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):463:493 -> a
+    703:727:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):469:493 -> a
+    728:735:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):488:495 -> a
+    736:736:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):493:493 -> a
+    737:737:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$2(com.android.tools.r8.graph.DexField):457:457 -> a
+    738:739:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):520:521 -> a
+    740:748:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):538:546 -> a
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.ir.optimize.i$a:
+    java.util.Map fieldsWithStaticValues -> a
+    com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> b
+    1:1:void <clinit>():66:66 -> <clinit>
+    1:2:void <init>(java.util.Map):71:72 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult empty():76:76 -> a
+    2:3:void forEachOptimizedField(java.util.function.BiConsumer):80:81 -> a
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    4:4:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):86 -> a
+    5:6:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):87:88 -> a
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.ir.optimize.j:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization this$0 -> c
     java.util.Set noLongerWrittenFields -> b
-    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
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.ir.optimize.l:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):101:101 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):96:103 -> <init>
+    1:2:void join(java.util.Map,java.util.Set):109:110 -> a
+    3:5:void execute():116:118 -> a
+    6:10:void execute():117:121 -> a
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.ir.optimize.k:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> e
@@ -32336,7 +32305,7 @@
     4:4:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):239:239 -> a
     5:28:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):323:346 -> a
     29:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):413:413 -> a
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1335:1335 -> a
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1350:1350 -> a
     30:30:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):413 -> a
     31:32:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():629:630 -> a
     31:32:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):413 -> a
@@ -32387,11 +32356,11 @@
     443:490:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1950:1997 -> a
     491:492:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2533:2534 -> a
     493:493:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2699:2699 -> a
-    494:494:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():959:959 -> a
+    494:494:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():960:960 -> a
     494:494:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2699 -> a
     495:496:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2699:2700 -> a
     497:524:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2710:2737 -> a
-    525:525:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():959:959 -> a
+    525:525:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():960:960 -> a
     525:525:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2741 -> a
     526:540:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2756:2770 -> a
     541:566:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2944:2969 -> a
@@ -32404,7 +32373,7 @@
     596:596:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3164 -> a
     597:613:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3164:3180 -> a
     614:614:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3179:3179 -> a
-    615:615:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    615:615:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
     615:615:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3178 -> a
     616:627:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3178:3189 -> a
     628:650:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3200:3222 -> a
@@ -32436,24 +32405,24 @@
     733:733:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3379:3379 -> a
     733:733:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3369 -> a
     734:735:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3388:3389 -> a
-    736:736:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    736:736:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
     736:736:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3390 -> a
     737:737:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3392:3392 -> a
-    738:738:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    738:738:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     738:738:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3392 -> a
     739:740:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3392:3393 -> a
     741:761:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3403:3423 -> a
-    762:762:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    762:762:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
     762:762:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3422 -> a
     763:769:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3425:3431 -> a
     770:808:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3429:3467 -> a
-    809:812: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
+    809:812: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):1396:1399 -> a
     809:812:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3467 -> a
     813:835:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3468:3490 -> a
-    836:836:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    836:836:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
     836:836:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3490 -> a
-    837:838:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3491:3492 -> a
-    839:854:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3491:3506 -> a
+    837:839:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3491:3491 -> a
+    841:854:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3493:3506 -> a
     855:862:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3510:3517 -> a
     863:873:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3530:3540 -> a
     863:873:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
@@ -32492,16 +32461,16 @@
     917:917:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
     918:924:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3544:3550 -> a
     1:1:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178:178 -> b
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> b
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> b
     2:2:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180 -> b
     3:25:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):182:204 -> b
-    26:26:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> b
+    26:26:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1130:1130 -> b
     26:26:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):216 -> b
     27:28:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):219:220 -> b
     29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> b
     29:29:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):220 -> b
     30:33:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):220:223 -> b
-    34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> b
+    34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> b
     34:34:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180 -> b
     35:36:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):311:312 -> b
     37:46:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):351:360 -> b
@@ -32517,8 +32486,7 @@
     80:89:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2312:2321 -> b
     80:89:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2366 -> b
     90:105:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2367:2382 -> b
-    106:108:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3651:3653 -> b
-    109:109:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3651:3651 -> b
+    106:109:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3651:3651 -> b
     1:1:java.util.Map lambda$shortenLiveRangesInsideBlock$8(com.android.tools.r8.ir.code.BasicBlock):1908:1908 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2675:2675 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2570 -> c
@@ -32535,20 +32503,20 @@
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> e
     2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1713 -> e
     1:47:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2781:2827 -> f
-    48:49:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1092:1093 -> f
+    48:49:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1096:1097 -> f
     48:49:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2827 -> f
     50:61:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2828:2839 -> f
     1:51:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2559:2609 -> g
-    52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():959:959 -> g
+    52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():960:960 -> g
     52:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2610 -> g
     53:62:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2612:2621 -> g
     63:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2620:2620 -> g
-    64:64:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():959:959 -> g
+    64:64:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():960:960 -> g
     64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2627 -> g
     65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2630:2630 -> g
     66:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2629:2642 -> g
     80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2641:2641 -> g
-    81:81:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():959:959 -> g
+    81:81:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():960:960 -> g
     81:81:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2648 -> g
     82:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2651:2651 -> g
     83:102:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2650:2669 -> g
@@ -32570,7 +32538,7 @@
     32:32:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
     32:32:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1311 -> i
     33:33:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1312:1312 -> i
-    34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> i
+    34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> i
     34:34:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1313 -> i
     35:40:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1315:1320 -> i
     41:57:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1352:1368 -> i
@@ -32581,13 +32549,13 @@
     59:98:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1369:1408 -> i
     59:98:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1320 -> i
     99:107:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1321:1329 -> i
-    108:108:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> i
+    108:108:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1130:1130 -> i
     108:108:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1341 -> i
     109:113:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1342:1346 -> i
     1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):227:239 -> j
     14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):236:242 -> j
     1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3035:3035 -> k
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> k
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> k
     2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3039 -> k
     3:45:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3040:3082 -> k
     46:46:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> k
@@ -32599,23 +32567,23 @@
     63:63:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> k
     63:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3100 -> k
     64:64:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3105:3105 -> k
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> l
     1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3109 -> l
     2:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3110:3134 -> l
-    27:27:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> l
+    27:27:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> l
     27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3135 -> l
     28:28:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> l
     28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3136 -> l
     29:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3140:3140 -> l
     1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1181:1181 -> m
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> m
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> m
     2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1181 -> m
     3:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1184:1217 -> m
     37:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1216:1263 -> m
-    85:85:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> m
+    85:85:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1130:1130 -> m
     85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1264 -> m
     86:87:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1265:1266 -> m
-    88:88:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> m
+    88:88:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1130:1130 -> m
     88:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1267 -> m
     89:90:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1269:1270 -> m
     91:91:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> m
@@ -32630,7 +32598,7 @@
     26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1027:1035 -> n
     26:34:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):869 -> n
     35:59:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):871:895 -> n
-    60:60:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> n
+    60:60:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> n
     60:60:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):895 -> n
     61:88:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):896:923 -> n
     89:89:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> n
@@ -32655,7 +32623,7 @@
     260:263:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):1007:1010 -> n
     1:58:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):250:307 -> o
     1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3324:3340 -> p
-    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> p
+    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> p
     18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3347 -> p
     19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3348:3363 -> p
     1:54:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1712:1765 -> q
@@ -32664,14 +32632,14 @@
     56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):29:29 -> q
     56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1766 -> q
     57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1767:1781 -> q
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1296:1296 -> q
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1311:1311 -> q
     72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1782 -> q
     73:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1782:1785 -> q
     77:78:void forEachUse(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):1812:1813 -> q
     77:78:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1785 -> q
     79:88:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1799:1808 -> q
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2027:2027 -> r
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> r
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> r
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2027 -> r
     3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2030:2038 -> r
     12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2003:2019 -> r
@@ -32737,14 +32705,14 @@
     70:72:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2873:2875 -> s
     70:72:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> s
     70:72:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> s
-    73:73:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():959:959 -> s
+    73:73:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():960:960 -> s
     73:73:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2875 -> s
     73:73:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> s
     73:73:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> s
     74:108:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2876:2910 -> s
     74:108:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> s
     74:108:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> s
-    109:109:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> s
+    109:109:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> s
     109:109:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2911 -> s
     109:109:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> s
     109:109:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> s
@@ -32834,12 +32802,12 @@
     68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> v
     69:76:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1688:1695 -> v
     69:76:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> v
-    77:89:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1884:1896 -> v
+    77:89:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1888:1900 -> v
     77:89:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1698 -> v
     77:89:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> v
     90:90:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1701:1701 -> v
     90:90:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> v
-    91:91:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1884:1884 -> v
+    91:91:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1888:1888 -> v
     91:91:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1698 -> v
     91:91:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> v
     92:97:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1644:1649 -> v
@@ -32849,8 +32817,8 @@
     109:109:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1608 -> v
     110:110:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1625:1625 -> v
     1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3650:3695 -> w
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.ir.optimize.l$a:
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.ir.optimize.l$b:
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.ir.optimize.k$a:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.ir.optimize.k$b:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():2228:2228 -> <clinit>
@@ -32861,7 +32829,7 @@
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2228:2228 -> doEquivalent
     2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241:2241 -> doEquivalent
     2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2228 -> doEquivalent
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1268:1268 -> doEquivalent
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1283:1283 -> doEquivalent
     3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241 -> doEquivalent
     3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2228 -> doEquivalent
     4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2245:2260 -> doEquivalent
@@ -32869,7 +32837,7 @@
     1:1:int doHash(java.lang.Object):2228:2228 -> doHash
     2:16:int doHash(com.android.tools.r8.ir.code.Instruction):2271:2285 -> doHash
     2:16:int doHash(java.lang.Object):2228 -> doHash
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.ir.optimize.l$c:
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.ir.optimize.k$c:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
     com.android.tools.r8.ir.code.Value left -> d
@@ -32882,24 +32850,24 @@
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):543:543 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):553:553 -> a
     4:9:com.android.tools.r8.ir.code.BasicBlock build():558:563 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> a
     10:10:com.android.tools.r8.ir.code.BasicBlock build():563 -> a
     11:16:com.android.tools.r8.ir.code.BasicBlock build():564:569 -> a
-    17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1396:1399 -> a
     17:20:com.android.tools.r8.ir.code.BasicBlock build():569 -> a
     21:23:com.android.tools.r8.ir.code.BasicBlock build():571:573 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):548:548 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.ir.optimize.l$d:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.ir.optimize.k$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>():138:140 -> <clinit>
     1:1:void <init>(java.lang.String,int):137:137 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.ir.optimize.l$e:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.ir.optimize.k$e:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Position):448:449 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.ir.optimize.l$f:
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.ir.optimize.k$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():657:657 -> <clinit>
@@ -32924,12 +32892,12 @@
     10:10:int getMin():670:670 -> b
     10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):678 -> b
     11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):678:679 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.ir.optimize.l$g:
+com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.ir.optimize.k$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>():1276:1277 -> <clinit>
     1:1:void <init>(java.lang.String,int):1275:1275 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.ir.optimize.l$h:
+com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.ir.optimize.k$h:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -32942,7 +32910,7 @@
     9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3595:3595 -> <init>
     1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3605:3607 -> a
     1:33:void dfs(com.android.tools.r8.ir.code.Value):3611:3643 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.ir.optimize.l$i:
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.ir.optimize.k$i:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
@@ -32952,12 +32920,12 @@
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):480:480 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):485:485 -> a
     4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):491:512 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1422:1425 -> a
+    26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1426:1429 -> a
     26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):512 -> a
     30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):513:514 -> a
     32:32:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):503:503 -> a
     1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):509:509 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.ir.optimize.n:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.ir.optimize.m:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> a
     int numberOfEffectivelyFinalFieldCanonicalization -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> g
@@ -32966,52 +32934,51 @@
     int numberOfConstClassCanonicalization -> e
     int numberOfConstNumberCanonicalization -> b
     int numberOfConstStringCanonicalization -> c
-    1:1:void <clinit>():42:42 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter):55:55 -> <init>
-    2:14:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter):48:60 -> <init>
-    1:3:void logResults():65:67 -> a
-    4:7:void logResults():66:69 -> a
-    8:12:void logResults():68:72 -> a
-    13:17:void logResults():70:74 -> a
-    18:23:void logResults():73:78 -> a
-    24:30:void logResults():75:81 -> a
-    31:32:void lambda$logResults$0(java.lang.Long,java.lang.Integer):82:83 -> a
-    33:33:void lambda$logResults$0(java.lang.Long,java.lang.Integer):82:82 -> a
-    34:35:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88:89 -> a
-    36:36:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):184:184 -> a
-    36:36:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):89 -> a
-    37:67:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):123:153 -> a
-    68:69:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):270:271 -> a
-    68:69:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):161 -> a
-    70:144:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):164:238 -> a
-    145:168:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):212:235 -> a
-    169:174:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):224:229 -> a
-    175:175:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):228:228 -> a
-    176:210:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):206:240 -> a
-    211:222:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):255:266 -> a
-    211:222:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):241 -> a
-    223:232:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):242:251 -> a
-    233:233:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):165:165 -> a
-    234:234:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):182:182 -> a
-    235:235:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):192:192 -> a
-    1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):191:191 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.ir.optimize.m:
+    1:1:void <clinit>():44:44 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter):57:57 -> <init>
+    2:14:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter):50:62 -> <init>
+    1:3:void logResults():67:69 -> a
+    4:7:void logResults():68:71 -> a
+    8:12:void logResults():70:74 -> a
+    13:17:void logResults():72:76 -> a
+    18:23:void logResults():75:80 -> a
+    24:30:void logResults():77:83 -> a
+    31:33:void lambda$logResults$0(java.lang.Long,java.lang.Integer):84:84 -> a
+    34:36:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):90:92 -> a
+    37:37:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):184:184 -> a
+    37:37:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92 -> a
+    38:75:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126:163 -> a
+    76:77:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):280:281 -> a
+    76:77:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):171 -> a
+    78:152:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174:248 -> a
+    153:176:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):222:245 -> a
+    177:182:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):234:239 -> a
+    183:183:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):238:238 -> a
+    184:218:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):216:250 -> a
+    219:230:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):265:276 -> a
+    219:230:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):251 -> a
+    231:240:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):252:261 -> a
+    241:241:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):175:175 -> a
+    242:242:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):192:192 -> a
+    243:243:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):202:202 -> a
+    1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):201:201 -> b
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.ir.optimize.l:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():91:91 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):91:91 -> <init>
-    1:1:boolean equals(java.lang.Object,java.lang.Object):91:91 -> a
-    2:4:boolean equals(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):116:118 -> a
-    2:4:boolean equals(java.lang.Object,java.lang.Object):91 -> a
-    5:5:int hashCode(java.lang.Object):91:91 -> a
-    6:20:int hashCode(com.android.tools.r8.ir.code.Instruction):95:109 -> a
-    6:20:int hashCode(java.lang.Object):91 -> a
-    21:28:int hashCode(com.android.tools.r8.ir.code.Instruction):100:107 -> a
-    21:28:int hashCode(java.lang.Object):91 -> a
-    29:29:int hashCode(com.android.tools.r8.ir.code.Instruction):105:105 -> a
-    29:29:int hashCode(java.lang.Object):91 -> a
-    30:30:int hashCode(com.android.tools.r8.ir.code.Instruction):98:98 -> a
-    30:30:int hashCode(java.lang.Object):91 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.ir.optimize.o:
+    1:1:void <clinit>():94:94 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):94:94 -> <init>
+    1:1:boolean equals(java.lang.Object,java.lang.Object):94:94 -> a
+    2:4:boolean equals(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):119:121 -> a
+    2:4:boolean equals(java.lang.Object,java.lang.Object):94 -> a
+    5:5:int hashCode(java.lang.Object):94:94 -> a
+    6:20:int hashCode(com.android.tools.r8.ir.code.Instruction):98:112 -> a
+    6:20:int hashCode(java.lang.Object):94 -> a
+    21:28:int hashCode(com.android.tools.r8.ir.code.Instruction):103:110 -> a
+    21:28:int hashCode(java.lang.Object):94 -> a
+    29:29:int hashCode(com.android.tools.r8.ir.code.Instruction):108:108 -> a
+    29:29:int hashCode(java.lang.Object):94 -> a
+    30:30:int hashCode(com.android.tools.r8.ir.code.Instruction):101:101 -> a
+    30:30:int hashCode(java.lang.Object):94 -> a
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.ir.optimize.n:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
@@ -33038,7 +33005,7 @@
     32:39:void removeDeadPhis(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):79:86 -> b
     32:39:void run(com.android.tools.r8.ir.code.IRCode):48 -> b
     40:42:void run(com.android.tools.r8.ir.code.IRCode):50:52 -> b
-com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.ir.optimize.p:
+com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.ir.optimize.o:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> d
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -33068,12 +33035,12 @@
     60:60:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):148 -> a
     61:71: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):149:159 -> a
     72:92: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):155:175 -> a
-    93:93:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):786:786 -> a
+    93:93:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):791:791 -> a
     93:93:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):175 -> a
     94:98: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):179:183 -> a
     99:99: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):157:157 -> a
     100:108: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):193:201 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     109:109:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):201 -> a
     110:184: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):201:275 -> a
     185:185:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):274:274 -> a
@@ -33105,7 +33072,7 @@
     355:371:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):565 -> a
     372:404:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):593:625 -> a
     405:405:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):684:684 -> a
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.ir.optimize.q:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.ir.optimize.p:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():37:37 -> <clinit>
@@ -33122,7 +33089,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):1045:1045 -> 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):1049:1049 -> 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
@@ -33132,7 +33099,7 @@
     182:182:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     182:182:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):225 -> a
     183:185:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):225:227 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.ir.optimize.r:
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.ir.optimize.q:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -33144,7 +33111,7 @@
     83:88:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
     89:104:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):161:176 -> a
     1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:156 -> b
-com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.ir.optimize.s:
+com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.ir.optimize.r:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):35:35 -> <init>
@@ -33153,7 +33120,93 @@
     2:44:void processClasses(com.android.tools.r8.graph.DexProgramClass):51:93 -> a
     2:44:com.android.tools.r8.shaking.AppInfoWithLiveness run():41 -> a
     45:48:com.android.tools.r8.shaking.AppInfoWithLiveness run():43:46 -> a
-com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.ir.optimize.t:
+com.android.tools.r8.ir.optimize.EnumUnboxer -> com.android.tools.r8.ir.optimize.t:
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.Map debugLogs -> d
+    com.android.tools.r8.graph.DexItemFactory factory -> e
+    boolean $assertionsDisabled -> f
+    java.util.Set enumsToUnbox -> b
+    boolean debugLogEnabled -> c
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:11:void <init>(com.android.tools.r8.graph.AppView):43:53 -> <init>
+    1:1:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):64:64 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    2:2:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):64 -> a
+    3:3:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):65:65 -> a
+    4:16:void analyzeEnumsInMethod(com.android.tools.r8.ir.code.IRCode):101:113 -> a
+    4:16:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):68 -> a
+    17:19:void markEnumAsUnboxable(com.android.tools.r8.ir.optimize.EnumUnboxer$Reason,com.android.tools.r8.graph.DexProgramClass):72:74 -> a
+    20:21:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):78:79 -> a
+    22:25:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):94:97 -> a
+    22:25:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):80 -> a
+    26:30:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):82:86 -> a
+    31:34:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):94:97 -> a
+    31:34:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):87 -> a
+    35:35:com.android.tools.r8.ir.optimize.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):121:121 -> a
+    36:51:com.android.tools.r8.ir.optimize.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):175:190 -> a
+    36:51:com.android.tools.r8.ir.optimize.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):122 -> a
+    52:52:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    52:52:com.android.tools.r8.ir.optimize.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):190 -> a
+    52:52:com.android.tools.r8.ir.optimize.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):122 -> a
+    53:128:com.android.tools.r8.ir.optimize.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):192:267 -> a
+    53:128:com.android.tools.r8.ir.optimize.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):122 -> a
+    129:142:com.android.tools.r8.ir.optimize.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):123:136 -> a
+    143:154:void finishEnumAnalysis():140:151 -> a
+    155:155:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):791:791 -> a
+    155:155:void finishEnumAnalysis():151 -> a
+    156:170:void finishEnumAnalysis():152:166 -> a
+    171:178:void reportEnumsAnalysis():271:278 -> a
+    171:178:void finishEnumAnalysis():167 -> a
+    179:194:void reportEnumsAnalysis():273:288 -> a
+    179:194:void finishEnumAnalysis():167 -> a
+    195:196:void reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.EnumUnboxer$Reason):292:293 -> a
+com.android.tools.r8.ir.optimize.EnumUnboxer$Reason -> com.android.tools.r8.ir.optimize.s:
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason UNSUPPORTED_LIBRARY_CALL -> s
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason NAME_INVOKE -> r
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason TO_STRING_INVOKE -> q
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason COMPARE_TO_INVOKE -> p
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason TYPE_MISSMATCH_FIELD_PUT -> w
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason FIELD_PUT_ON_ENUM -> v
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason INVALID_FIELD_PUT -> u
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason MISSING_INFO_MAP -> t
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason OTHER_UNSUPPORTED_INSTRUCTION -> x
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason INTERFACE -> c
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason SUBTYPES -> b
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason ELIGIBLE -> a
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason UNEXPECTED_DIRECT_METHOD -> g
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason VIRTUAL_METHOD -> f
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason UNEXPECTED_STATIC_FIELD -> e
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason INSTANCE_FIELD -> d
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason INVALID_INVOKE -> k
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason INVALID_CLINIT -> j
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason INVALID_INIT -> i
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason INVALID_PHI -> h
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason VALUES_INVOKE -> o
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason VALUE_OF_INVOKE -> n
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason IMPLICIT_UP_CAST_IN_RETURN -> m
+    com.android.tools.r8.ir.optimize.EnumUnboxer$Reason INVALID_INVOKE_ON_ARRAY -> l
+    1:24:void <clinit>():298:321 -> <clinit>
+    1:1:void <init>(java.lang.String,int):297:297 -> <init>
+com.android.tools.r8.ir.optimize.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.ir.optimize.u:
+    com.android.tools.r8.graph.DexItemFactory factory -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.ir.optimize.EnumUnboxer enumUnboxer -> b
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.EnumUnboxer):23:26 -> <init>
+    1:2:java.util.Set findCandidates():30:31 -> a
+    3:17:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):40:54 -> a
+    3:17:java.util.Set findCandidates():32 -> a
+    18:26:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):97:105 -> a
+    18:26:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):57 -> a
+    18:26:java.util.Set findCandidates():32 -> a
+    27:48:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):58:79 -> a
+    27:48:java.util.Set findCandidates():32 -> a
+    49:49:boolean isStandardEnumInitializer(com.android.tools.r8.graph.DexEncodedMethod):90:90 -> a
+    49:49:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):80 -> a
+    49:49:java.util.Set findCandidates():32 -> a
+    50:51:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):81:82 -> a
+    50:51:java.util.Set findCandidates():32 -> a
+    52:52:java.util.Set findCandidates():33:33 -> a
+com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.ir.optimize.v:
     java.util.Map invokesToInline -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexEncodedMethod method -> b
@@ -33172,7 +33225,7 @@
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):72:84 -> a
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):67 -> a
     19:22:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):130:133 -> a
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.v:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.x:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
@@ -33211,7 +33264,7 @@
     201:219:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):267:285 -> a
     220:220:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):280:280 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):195:195 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.ir.optimize.u:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.ir.optimize.w:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -33221,7 +33274,7 @@
     7:7:int hashCode(java.lang.Object):97:97 -> a
     8:8:int hashCode(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
     8:8:int hashCode(java.lang.Object):97 -> a
-com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.ir.optimize.w:
+com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.ir.optimize.y:
     java.util.Set doubleInlineCallers -> g
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> e
     java.util.Set doubleInlineSelectedTargets -> h
@@ -33239,10 +33292,10 @@
     1:19:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):105:123 -> a
     20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):118:118 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):145:145 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1487 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1502 -> 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):145 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1487:1487 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1502:1502 -> 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):145 -> a
     24:29:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):1060:1065 -> a
     24:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):146 -> a
@@ -33292,12 +33345,12 @@
     311:317:void applyAssumerToInlinee(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):1138:1144 -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
     1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):172:178 -> b
-    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():959:959 -> b
+    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():960:960 -> b
     8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):178 -> b
     9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):228:239 -> b
     1:1:boolean isDoubleInliningEnabled():131:131 -> c
     2:8:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):216:222 -> c
-com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.w$a:
+com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.y$a:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
     com.android.tools.r8.ir.optimize.Inliner$Constraint[] $VALUES -> h
@@ -33307,11 +33360,11 @@
     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>():262:278 -> <clinit>
-    18:47:void <clinit>():262:291 -> <clinit>
+    1:18:void <clinit>():262:262 -> <clinit>
+    43:47:void <clinit>():287:291 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):282:283 -> <init>
     1:1:boolean isSet(int):295:295 -> b
-com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.w$b:
+com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.y$b:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
@@ -33363,7 +33416,7 @@
     1:4:int hashCode():338:341 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():51:51 -> hashCode
     5:5:int hashCode():341 -> hashCode
-com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.w$c:
+com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.y$c:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
@@ -33372,7 +33425,7 @@
     1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):572:575 -> <init>
     1:1:void setShouldSynthesizeNullCheckForReceiver():579:579 -> a
     2:16:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):589:603 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     17:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):603 -> a
     18:42:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):604:628 -> a
     43:45:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> a
@@ -33380,33 +33433,33 @@
     46:63:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):630:647 -> a
     64:88:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):646:670 -> a
     89:94:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):669:674 -> a
-    95:95:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    95:95:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
     95:95:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):676 -> a
     96:96:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):676:676 -> a
     97:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):674:683 -> a
     107:107:java.lang.Object com.android.tools.r8.utils.ListUtils.first(java.util.List):16:16 -> a
     107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685 -> a
     108:108:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685:685 -> a
-    109:109: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):1073:1073 -> a
+    109:109: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):1077:1077 -> a
     109:109:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):687 -> a
     110:111:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):688:689 -> a
     112:112:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):136:136 -> a
     112:112:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):691 -> a
     113:142:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):695:724 -> a
     143:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):723:723 -> a
-    144:144:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    144:144:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
     144:144:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):722 -> a
     145:178:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):725:758 -> a
     179:179:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):690:690 -> a
-com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.x:
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.z:
     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):767:769 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.y:
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.A:
     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):813:815 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.w$d:
+com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.y$d:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason NEVER -> f
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
@@ -33416,7 +33469,7 @@
     1:6:void <clinit>():551:556 -> <clinit>
     1:1:void <init>(java.lang.String,int):550:550 -> <init>
     1:1:boolean mustBeInlined():560:560 -> a
-com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.z:
+com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.B:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
     boolean allowStaticInterfaceMethodCalls -> b
@@ -33488,12 +33541,12 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):228:228 -> e
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):281:281 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):289:289 -> g
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.A:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.C:
     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.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType) -> a
     boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.B:
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.D:
     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
@@ -33501,7 +33554,7 @@
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.ir.optimize.C:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.ir.optimize.E:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:15 -> <init>
     1:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):20:21 -> a
@@ -33509,7 +33562,7 @@
     1:1:int doHash(java.lang.Object):11:11 -> doHash
     2:11:int doHash(com.android.tools.r8.ir.code.Instruction):27:36 -> doHash
     2:11:int doHash(java.lang.Object):11 -> doHash
-com.android.tools.r8.ir.optimize.MemberPoolCollection -> com.android.tools.r8.ir.optimize.D:
+com.android.tools.r8.ir.optimize.MemberPoolCollection -> com.android.tools.r8.ir.optimize.F:
     java.util.Map memberPools -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
@@ -33571,7 +33624,7 @@
     2:2:void lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):158 -> d
     3:3:void addNonNull(java.util.Collection,java.lang.Object):236:236 -> d
     3:3:void lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):158 -> d
-com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.ir.optimize.D$a:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.ir.optimize.F$a:
     java.util.Set interfaces -> c
     java.util.Set subTypes -> d
     java.util.Set memberPool -> e
@@ -33601,62 +33654,64 @@
     4:4:boolean lambda$hasSeenBelow$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):230:230 -> c
     1:1:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):221:221 -> d
     1:2:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):196:197 -> e
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.ir.optimize.G:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.ir.optimize.I:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Reporter reporter -> b
-    1:3:void <clinit>():39:41 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):80:80 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView):47:82 -> <init>
-    1:5:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):86:90 -> a
-    6:13:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):105:112 -> a
-    14:14: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):187:187 -> a
-    15: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):119:136 -> a
-    15: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):187 -> a
-    33:42: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:144 -> a
-    33:42: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):187 -> a
-    43:61: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:159 -> a
-    43:61: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):187 -> a
-    62:73: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):154:165 -> a
-    62:73: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):187 -> a
-    74:74: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):190:190 -> a
-    75:77:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):174:176 -> a
-    75:77: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):190 -> a
-    78:91: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):193:206 -> a
-    92:99: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):303:310 -> a
-    100:146: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):309:355 -> a
-    147:147:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):310:310 -> a
-    148:162:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):395:409 -> a
-    163:212: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):219:268 -> a
-    163:212:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):408 -> a
-    213:217:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):94:98 -> a
-    213:217: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):272 -> a
-    213:217:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):408 -> a
-    218:234: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):276:292 -> a
-    218:234:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):408 -> a
-    235:241:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):410:416 -> a
-    242:250:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):411:419 -> a
-    251:272: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):364:385 -> a
-    251:272:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):418 -> a
-    273:274:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):423:424 -> a
-    275:275:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    275:275:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):424 -> a
-    276:278:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):424:426 -> a
-com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.E:
+    1:3:void <clinit>():38:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):79:79 -> <init>
+    2:37:void <init>(com.android.tools.r8.graph.AppView):46:81 -> <init>
+    1:8:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):104:111 -> a
+    9:9: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):183:183 -> a
+    10:27: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):118:135 -> a
+    10:27: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):183 -> a
+    28:37: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):134:143 -> a
+    28:37: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):183 -> a
+    38:56: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):140:158 -> a
+    38:56: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):183 -> a
+    57:57: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):153:153 -> a
+    57:57: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):183 -> a
+    58:58: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):186:186 -> a
+    59:61:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):170:172 -> a
+    59:61: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):186 -> a
+    62:75: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):189:202 -> a
+    76:83:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):299:306 -> a
+    84:87:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):305:308 -> a
+    88:88:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    88:88:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):313 -> a
+    89:89:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):313:313 -> a
+    90:94:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):85:89 -> a
+    90:94:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):317 -> a
+    95:125:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):322:352 -> a
+    126:126:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):306:306 -> a
+    127:141:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):362:376 -> a
+    142:191: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):215:264 -> a
+    142:191:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):375 -> a
+    192:196:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):93:97 -> a
+    192:196: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):268 -> a
+    192:196:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):375 -> a
+    197:213: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):272:288 -> a
+    197:213:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):375 -> a
+    214:216:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):377:379 -> a
+    217:223:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):378:384 -> a
+    224:224:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    224:224:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):384 -> a
+    225:227:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):384:386 -> a
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.G:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType type -> a
-    1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):60:62 -> <init>
-    1:5:boolean equals(java.lang.Object):67:71 -> equals
-    1:1:int hashCode():76:76 -> hashCode
-com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.F:
+    1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):59:61 -> <init>
+    1:5:boolean equals(java.lang.Object):66:70 -> equals
+    1:1:int hashCode():75:75 -> hashCode
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.H:
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_VALUES -> c
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType NONE -> a
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_NO_SIDE_EFFECTS -> b
-    1:3:void <clinit>():50:52 -> <clinit>
-    1:1:void <init>(java.lang.String,int):49:49 -> <init>
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.H:
+    1:3:void <clinit>():49:51 -> <clinit>
+    1:1:void <init>(java.lang.String,int):48:48 -> <init>
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.J:
     java.util.function.Predicate methodTester -> e
     1:2:void <init>(com.android.tools.r8.graph.AppView):37:38 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate):43:44 -> <init>
@@ -33673,7 +33728,7 @@
     21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> f
     21:21:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):73 -> f
     22:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):75:78 -> f
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.ir.optimize.I:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.ir.optimize.K:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> b
     java.util.Set activeMoves -> a
     1:1:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):17:17 -> <init>
@@ -33681,7 +33736,7 @@
     1:12:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):22:33 -> a
     13:51:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):32:70 -> a
     52:56:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):55:59 -> a
-com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.ir.optimize.J:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.ir.optimize.L:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -33719,11 +33774,11 @@
     56:56:void processNestFrom(com.android.tools.r8.graph.DexClass):88 -> a
     56:56:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
     57:63:boolean hasPrivateMembers(com.android.tools.r8.graph.DexClass):123:129 -> a
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.ir.optimize.K:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.ir.optimize.M:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:14:boolean sameNest(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):27:40 -> a
-    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> 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):190:190 -> 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
@@ -33742,7 +33797,7 @@
     41:47:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):73:79 -> a
     48:48:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
     48:48:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):77 -> a
-com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.ir.optimize.L:
+com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.ir.optimize.N:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer splitBlockConsumer -> c
@@ -33764,7 +33819,7 @@
     271:271:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):353 -> a
     272:280:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):355:363 -> a
     281:284:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):372:375 -> a
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.ir.optimize.Q:
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.ir.optimize.T:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -33787,7 +33842,7 @@
     29:29:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
     29:29:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1345 -> a
     30:33:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1345:1348 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     34:34:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1348 -> a
     35:67:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1349:1381 -> a
     68:74:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1398:1404 -> a
@@ -33802,7 +33857,7 @@
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):105:105 -> e
     2:8:boolean selectMethodsForOutlining():1305:1311 -> e
     9:15:boolean selectMethodsForOutlining():1310:1316 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.ir.optimize.M:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.ir.optimize.O:
     com.android.tools.r8.ir.code.NumericType numericType -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):208:209 -> <init>
     java.lang.String getDetailsString() -> a
@@ -33819,8 +33874,8 @@
     32:36:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):267:271 -> a
     37:37:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():567:567 -> a
     37:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):273 -> a
-    38:39:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):275:276 -> a
-    40:43:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):275:278 -> a
+    38:40:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):275:275 -> a
+    43:43:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):278:278 -> a
     44:44:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():567:567 -> a
     44:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):280 -> a
     45:64:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):280:299 -> a
@@ -33836,7 +33891,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():180:180 -> hashCode
     1:1:int hashCode():220 -> hashCode
     2:2:int hashCode():220:220 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.ir.optimize.N:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.ir.optimize.P:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -33870,7 +33925,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():180:180 -> hashCode
     1:1:int hashCode():408 -> hashCode
     2:6:int hashCode():408:412 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.ir.optimize.O:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.ir.optimize.Q:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):310:311 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):331:331 -> a
@@ -33889,7 +33944,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():180:180 -> hashCode
     1:1:int hashCode():326 -> hashCode
     2:2:int hashCode():326:326 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.ir.optimize.P:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.ir.optimize.S:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -33913,19 +33968,19 @@
     1:18:boolean equals(java.lang.Object):585:602 -> equals
     1:6:int hashCode():610:615 -> hashCode
     1:37:java.lang.String toString():671:707 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.Q$a:
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.T$a:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> b
     com.android.tools.r8.ir.optimize.Outliner$Outline outline -> a
-    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1568:1569 -> <init>
-    1:2: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):1595:1596 -> buildIR
-    3:3:void com.android.tools.r8.ir.conversion.IRBuilder.<init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):428:428 -> buildIR
-    3:3: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):1596 -> buildIR
-    4:4: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):1596:1596 -> buildIR
-    1:1:boolean computeEquals(java.lang.Object):1616:1616 -> computeEquals
-    1:1:int computeHashCode():1611:1611 -> computeHashCode
-    1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):1606:1606 -> registerCodeReferences
-    1:1:java.lang.String toString():1601:1601 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.T:
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1570:1571 -> <init>
+    1:2: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):1597:1598 -> buildIR
+    3:3:void com.android.tools.r8.ir.conversion.IRBuilder.<init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):426:426 -> buildIR
+    3:3: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):1598 -> buildIR
+    4:4: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):1598:1598 -> buildIR
+    1:1:boolean computeEquals(java.lang.Object):1618:1618 -> computeEquals
+    1:1:int computeHashCode():1613:1613 -> computeHashCode
+    1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):1608:1608 -> registerCodeReferences
+    1:1:java.lang.String toString():1603:1603 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.V:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():121:121 -> <clinit>
@@ -33937,7 +33992,7 @@
     java.lang.String getInstructionName() -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.ir.optimize.S:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.ir.optimize.U:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType[] $VALUES -> h
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType ADD -> a
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType SUB -> b
@@ -33949,13 +34004,13 @@
     1:7:void <clinit>():127:133 -> <clinit>
     8:8:void <clinit>():126:126 -> <clinit>
     1:1:void <init>(java.lang.String,int):126:126 -> <init>
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.ir.optimize.U:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.ir.optimize.W:
     java.util.Map candidateMap -> q
     com.android.tools.r8.ir.optimize.Outliner this$0 -> r
     1:3:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):1141:1143 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1148:1150 -> a
     4:5:java.util.List addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1154:1155 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.ir.optimize.V:
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.ir.optimize.X:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
@@ -33968,43 +34023,45 @@
     4:6:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1261:1263 -> a
     4:6:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1197 -> a
     7:63:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1198:1254 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.W:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.Y:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> q
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):1162:1163 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1168:1170 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1169:1169 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.ir.optimize.X:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.ir.optimize.Z:
+    boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.optimize.Outliner this$0 -> d
     com.android.tools.r8.ir.code.Position position -> b
     com.android.tools.r8.ir.optimize.Outliner$Outline outline -> a
     int argumentMapIndex -> c
+    1:1:void <clinit>():1415:1415 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1421:1421 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1419:1423 -> <init>
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:1:int instructionCount():1428:1428 -> a
     2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1459:1459 -> a
-    3:12:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1473:1482 -> a
-    13:13:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1488:1488 -> a
-    14:18:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1499:1503 -> a
-    19:19:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():567:567 -> a
-    19:19:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1503 -> a
-    20:29:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1503:1512 -> a
-    30:30:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1518:1518 -> a
-    31:31:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1524:1524 -> a
-    32:32:int getMoveExceptionRegister(int):1534:1534 -> a
+    3:14:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1473:1484 -> a
+    15:15:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1490:1490 -> a
+    16:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1501:1505 -> a
+    21:21:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():567:567 -> a
+    21:21:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1505 -> a
+    22:31:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1505:1514 -> a
+    32:32:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1520:1520 -> a
+    33:33:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1526:1526 -> a
+    34:34:int getMoveExceptionRegister(int):1536:1536 -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
     int instructionOffset(int) -> b
     void setUp() -> b
     com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> c
     com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
     boolean verifyCurrentInstructionCanThrow() -> c
-    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1539:1539 -> d
-    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1544:1544 -> d
+    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1541:1541 -> d
+    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1546:1546 -> d
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.ir.optimize.Y:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.ir.optimize.a0:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     boolean $assertionsDisabled -> p
@@ -34029,7 +34086,7 @@
     5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):766:771 -> a
     11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):917:929 -> a
     24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):934:940 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):940 -> a
     32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):944:950 -> a
     39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):956:988 -> a
@@ -34065,7 +34122,7 @@
     201:201:void process():759 -> c
     202:212:void processInstruction(com.android.tools.r8.ir.code.Instruction):808:818 -> c
     202:212:void process():759 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.ir.optimize.Z:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.ir.optimize.b0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):40:40 -> a
@@ -34096,7 +34153,7 @@
     291:291:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):299 -> a
     292:314:com.android.tools.r8.ir.code.BasicBlock createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):335:357 -> a
     292:314:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):299 -> a
-    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> a
     315:315:com.android.tools.r8.ir.code.BasicBlock createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):358 -> a
     315:315:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):299 -> a
     316:345:com.android.tools.r8.ir.code.BasicBlock createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):359:388 -> a
@@ -34108,20 +34165,18 @@
     365:365:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtBlockExit(com.android.tools.r8.ir.code.BasicBlock):398 -> a
     366:368:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtBlockExit(com.android.tools.r8.ir.code.BasicBlock):399:401 -> a
     369:389:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):433:453 -> a
-    390:390:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    390:390:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
-    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    391:391:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
+    390:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> a
+    390:391:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
     392:392:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454:454 -> a
     393:407:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):453:467 -> a
-    408:408:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    408:408:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> a
     408:408:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):468 -> a
     409:412:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):468:471 -> a
     413:415:void removeWideConstantCovering(java.util.Map,int):544:546 -> a
     1:19:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):207:225 -> b
     20:20:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):224:224 -> b
     21:21:java.util.List lambda$shareIdenticalBlockSuffix$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):272:272 -> b
-com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.ir.optimize.a0:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.ir.optimize.c0:
     1:1:void <init>():21:21 -> <init>
     1:1:boolean optimize(com.android.tools.r8.ir.code.IRCode):24:24 -> a
     1:6:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):112:117 -> b
@@ -34143,7 +34198,7 @@
     39:50:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     51:64:boolean tryMovePhiToStack(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi,java.util.Set):160:173 -> b
     51:64:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.ir.optimize.d0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.ir.optimize.f0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
     boolean $assertionsDisabled -> j
@@ -34180,8 +34235,8 @@
     163:163:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> b
     163:163:void run():232 -> b
     164:166:void run():232:234 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.ir.optimize.b0:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.ir.optimize.c0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.ir.optimize.d0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.ir.optimize.e0:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -34191,7 +34246,7 @@
     1:1:com.android.tools.r8.graph.DexField access$100(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):75:75 -> a
     1:5:boolean equals(java.lang.Object):92:96 -> equals
     1:1:int hashCode():87:87 -> hashCode
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.ir.optimize.e0:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.ir.optimize.g0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:19:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38:56 -> a
@@ -34211,13 +34266,13 @@
     114:135:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):187:208 -> a
     114:135:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):58 -> a
     136:138:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62:64 -> a
-    139:140:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):357:358 -> a
+    139:140:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):393:394 -> a
     139:140:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):64 -> a
     141:150:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):65:74 -> a
     151:151:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     151:151:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74 -> a
     152:154:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:76 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.ir.optimize.g0:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.ir.optimize.i0:
     com.android.tools.r8.graph.AppView appView -> c
     java.util.concurrent.ConcurrentHashMap synthesizedServiceLoaders -> b
     com.android.tools.r8.graph.DexProgramClass synthesizedClass -> a
@@ -34227,7 +34282,7 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):72:78 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():82:82 -> a
     2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):86:86 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):87 -> a
     4:71:void rewrite(com.android.tools.r8.ir.code.IRCode):88:155 -> a
     72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
@@ -34235,7 +34290,7 @@
     73:83:void rewrite(com.android.tools.r8.ir.code.IRCode):159:169 -> a
     84:95:void rewrite(com.android.tools.r8.ir.code.IRCode):168:179 -> a
     96:97:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171:172 -> a
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    98:98:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     98:98:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
     99:99:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
     100:135:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):184:219 -> a
@@ -34259,7 +34314,7 @@
     253:253:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):233:233 -> a
     253:253:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):228 -> a
     254:254:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):230:230 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.f0:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.h0:
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> b
@@ -34269,7 +34324,7 @@
     2:5:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):290:293 -> a
     2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):273 -> a
     6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):274:286 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.ir.optimize.h0:
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.ir.optimize.j0:
     com.android.tools.r8.ir.code.IntSwitch theSwitch -> d
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean mayHaveIntroducedUnreachableBlocks -> e
@@ -34307,7 +34362,7 @@
     25:60:boolean optimize():66 -> c
     61:61:void replaceSwitchByOptimizedSwitch(int):140:140 -> c
     61:61:boolean optimize():66 -> c
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.i0:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.k0:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -34327,8 +34382,8 @@
     66:77:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):149:160 -> a
     78:78:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
     79:81:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
-com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.ir.optimize.j0:
-com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.k0:
+com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.ir.optimize.l0:
+com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.m0:
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
     com.android.tools.r8.ir.code.Instruction staticGet -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap indexMap -> d
@@ -34336,7 +34391,7 @@
     java.util.Map valueInfoMap -> e
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.Map,com.android.tools.r8.ir.optimize.SwitchUtils$1):23:23 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.Map):35:41 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.ir.optimize.n0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.ir.optimize.p0:
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -34353,132 +34408,140 @@
     13:27:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):133:147 -> a
     28:28:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):125:125 -> a
     29:29:void lambda$run$0(java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map,com.android.tools.r8.graph.DexProgramClass):136:136 -> a
-    30:77:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):156:203 -> a
-    78:92:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):202:216 -> a
-    93:93:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):214:214 -> a
-    94:137:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):212:255 -> a
-    138:138:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):253:253 -> a
-    139:168:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):251:280 -> a
-    169:169:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):278:278 -> a
-    170:181:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):276:287 -> a
-    182:182:boolean lambda$processClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):244:244 -> a
-    183:183:java.util.Set lambda$processClass$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):285:285 -> a
-    184:191:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):295:302 -> a
-    192:192:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):297:297 -> a
-    193:228:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):335:370 -> a
-    229:229:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):369:369 -> a
-    230:243:void rewrite(com.android.tools.r8.ir.code.IRCode):374:387 -> a
-    244:253: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
-    244:253:void rewrite(com.android.tools.r8.ir.code.IRCode):387 -> a
-    254:265:void rewrite(com.android.tools.r8.ir.code.IRCode):389:400 -> a
-    266:266:void rewrite(com.android.tools.r8.ir.code.IRCode):396:396 -> a
-    267:286:void rewrite(com.android.tools.r8.ir.code.IRCode):390:409 -> a
-    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:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> 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
-    326:330:void logResults():458:462 -> a
-    331:338:void logResults():459:466 -> a
-    339:344:void logResults():463:468 -> a
-    345:348:void logResults():467:470 -> a
-    349:352:void logResults():469:472 -> a
-    353:353:void logResults():471:471 -> a
-    354:391: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
-    392:399: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
-    400:402: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:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):307:318 -> b
-    13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> b
-    13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):321 -> b
-    14:17:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):322:325 -> b
-    18:28:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):320:330 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.ir.optimize.l0:
+    30:39:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):156:165 -> a
+    40:79:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):163:202 -> a
+    80:94:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):201:215 -> a
+    95:95:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):213:213 -> a
+    96:139:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):211:254 -> a
+    140:140:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):252:252 -> a
+    141:170:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):250:279 -> a
+    171:171:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):277:277 -> a
+    172:183:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):275:286 -> a
+    184:184:boolean lambda$processClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):243:243 -> a
+    185:185:java.util.Set lambda$processClass$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):284:284 -> a
+    186:192:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):294:300 -> a
+    193:193:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):298:298 -> a
+    194:194:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):296:296 -> a
+    195:199:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):333:337 -> a
+    200:213:void rewrite(com.android.tools.r8.ir.code.IRCode):341:354 -> a
+    214:223: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):406:415 -> a
+    214:223:void rewrite(com.android.tools.r8.ir.code.IRCode):354 -> a
+    224:235:void rewrite(com.android.tools.r8.ir.code.IRCode):356:367 -> a
+    236:236:void rewrite(com.android.tools.r8.ir.code.IRCode):363:363 -> a
+    237:256:void rewrite(com.android.tools.r8.ir.code.IRCode):357:376 -> a
+    257:265:void rewrite(com.android.tools.r8.ir.code.IRCode):375:383 -> a
+    266:286:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):503:523 -> a
+    266:286:void rewrite(com.android.tools.r8.ir.code.IRCode):382 -> a
+    287:287:void rewrite(com.android.tools.r8.ir.code.IRCode):392:392 -> a
+    288:288:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1130:1130 -> a
+    288:288:void rewrite(com.android.tools.r8.ir.code.IRCode):393 -> a
+    289:291:void rewrite(com.android.tools.r8.ir.code.IRCode):394:396 -> a
+    292:292:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    292:292:void rewrite(com.android.tools.r8.ir.code.IRCode):396 -> a
+    293:295:void rewrite(com.android.tools.r8.ir.code.IRCode):396:398 -> a
+    296:300:void logResults():425:429 -> a
+    301:308:void logResults():426:433 -> a
+    309:314:void logResults():430:435 -> a
+    315:318:void logResults():434:437 -> a
+    319:322:void logResults():436:439 -> a
+    323:323:void logResults():438:438 -> a
+    324:361: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):450:487 -> a
+    362:369: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):532:539 -> a
+    370:372: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):538:540 -> a
+    1:12:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):305:316 -> b
+    13:13:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo.builder():61:61 -> b
+    13:13:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):319 -> b
+    14:17:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):320:323 -> b
+    18:28:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):318:328 -> b
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.ir.optimize.n0:
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy ALLOW_ARGUMENT_REMOVAL -> a
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy DISALLOW_ARGUMENT_REMOVAL -> b
     1:2:void <clinit>():61:62 -> <clinit>
     1:1:void <init>(java.lang.String,int):60:60 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.ir.optimize.m0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.ir.optimize.o0:
     java.util.Map removedArgumentsInfoPerMethod -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():65:65 -> <clinit>
     1:7:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):74:80 -> <init>
     8:16:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):73:81 -> <init>
-    1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):86:97 -> lookupPrototypeChanges
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.ir.optimize.t0:
+    1:12:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):86:97 -> lookupPrototypeChanges
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.ir.optimize.v0:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedArguments -> d
     com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> e
     boolean $assertionsDisabled -> f
-    1:3:void <clinit>():45:47 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.MethodPoolCollection):92:92 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.MethodPoolCollection):52:94 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):45:45 -> a
-    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:47:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:231 -> a
-    37:47:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    48:48:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):281:281 -> a
-    48:48:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):235 -> a
-    48:48:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    49:61:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):236:248 -> a
-    49:61:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    62:93:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):286:317 -> a
-    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
-    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):319 -> a
-    95:97:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):320:322 -> a
-    98:105:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):318:325 -> a
-    106:124:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):332:350 -> a
-    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):254:271 -> b
-    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):270:275 -> b
-    1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> c
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.ir.optimize.o0:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.ir.optimize.p0:
+    1:3:void <clinit>():46:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.MethodPoolCollection):93:93 -> <init>
+    2:44:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.MethodPoolCollection):53:95 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):46:46 -> a
+    2:2:com.android.tools.r8.utils.MethodSignatureEquivalence access$100():46:46 -> a
+    3:10:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):99:99 -> a
+    19:36:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):108:125 -> a
+    37:47:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:232 -> a
+    37:47:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):218 -> a
+    48:48:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
+    48:48:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):236 -> a
+    48:48:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):218 -> a
+    49:49:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):237:237 -> a
+    49:49:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):218 -> a
+    50:51:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):333:334 -> a
+    50:51:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):238 -> a
+    50:51:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):218 -> a
+    52:62:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):239:249 -> a
+    52:62:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):218 -> a
+    63:94:com.android.tools.r8.graph.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.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo.builder():61:61 -> a
+    95:95:com.android.tools.r8.graph.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.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.RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):319:326 -> a
+    1:8:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):255:262 -> b
+    9:10:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):333:334 -> b
+    9:10:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):263 -> b
+    11:19:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:272 -> b
+    20:25:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):271:276 -> b
+    1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):218:218 -> c
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.ir.optimize.q0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.ir.optimize.r0:
     java.util.BitSet used -> a
-    1:3:void <init>():353:355 -> <init>
-    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):353:353 -> <init>
-    1:1:java.util.BitSet getUsedArguments():358:358 -> a
-    2:2:boolean register(int):363:363 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.ir.optimize.q0:
+    1:3:void <init>():337:339 -> <init>
+    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):337:337 -> <init>
+    1:1:java.util.BitSet getUsedArguments():342:342 -> a
+    2:2:boolean register(int):347:347 -> a
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.ir.optimize.s0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
-    1:2:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):183:184 -> <init>
-    1:12:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):193:204 -> a
-    13:15:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):210:212 -> a
-    16:16:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):211:211 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.ir.optimize.r0:
+    1:2:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):184:185 -> <init>
+    1:12:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):194:205 -> a
+    13:15:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):211:213 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):212:212 -> a
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.ir.optimize.t0:
     java.util.Map removedArguments -> a
-    1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory,java.util.Map):68:76 -> <init>
-    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):82:87 -> lookupPrototypeChanges
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.ir.optimize.s0:
+    1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory,java.util.Map):69:77 -> <init>
+    1:6:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):83:88 -> lookupPrototypeChanges
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.ir.optimize.u0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():127:127 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):127:130 -> <init>
-    5:5:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):127:127 -> <init>
-    1:1:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):137:137 -> a
-    1:1:void access$300(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures,com.android.tools.r8.graph.DexMethod):127 -> a
-    2:11:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):146:155 -> a
+    1:1:void <clinit>():128:128 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):128:131 -> <init>
+    5:5:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):128:128 -> <init>
+    1:1:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):138:138 -> a
+    1:1:void access$300(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures,com.android.tools.r8.graph.DexMethod):128 -> a
+    2:11:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):147:156 -> a
     12:12:java.lang.String com.android.tools.r8.utils.SymbolGenerationUtils.numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[]):35:35 -> a
-    12:12:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):152 -> a
-    13:23:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):151:161 -> a
-    24:24:boolean isMethodSignatureAvailable(com.android.tools.r8.graph.DexMethod):133:133 -> a
-    24:24:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):163 -> a
-    25:26:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):169:170 -> a
-    27:27:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):137:137 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):172 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):175:175 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):174:174 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.ir.optimize.u0.b:
+    12:12:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):153 -> a
+    13:23:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):152:162 -> a
+    24:24:boolean isMethodSignatureAvailable(com.android.tools.r8.graph.DexMethod):134:134 -> a
+    24:24:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):164 -> a
+    25:26:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):170:171 -> a
+    27:27:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):138:138 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):173 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):176:176 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentsInfo):175:175 -> a
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.ir.optimize.w0.b:
     java.util.concurrent.ConcurrentHashMap knownClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():39:39 -> <clinit>
@@ -34492,7 +34555,7 @@
     77:77:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     77:77:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):244 -> a
     78:103: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,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):244:269 -> a
-    104:104:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> a
+    104:104:boolean com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1130:1130 -> a
     104:104:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):270 -> a
     105:106: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,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):271:272 -> a
     107:107:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -34505,14 +34568,14 @@
     141:144:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):324:327 -> a
     141:144:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):309 -> a
     141:144:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):196 -> a
-    145:145:boolean com.android.tools.r8.graph.DexClass.isAbstract():626:626 -> a
+    145:145:boolean com.android.tools.r8.graph.DexClass.isAbstract():639:639 -> a
     145:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):329 -> a
     145:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):309 -> a
     145:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):196 -> a
     146:161:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):329:344 -> a
     146:161:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):309 -> a
     146:161:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):196 -> a
-    162:162:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):833:833 -> a
+    162:162:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):838:838 -> a
     162:162:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):349 -> a
     162:162:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):309 -> a
     162:162:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):196 -> a
@@ -34524,7 +34587,7 @@
     166:166:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):196 -> a
     167:168:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):310:311 -> a
     167:168:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):196 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.ir.optimize.u0.a:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.ir.optimize.w0.a:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus RETRIEVAL_MAY_HAVE_SIDE_EFFECTS -> c
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus UNKNOWN_TYPE -> d
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NON_CLASS_TYPE -> a
@@ -34544,7 +34607,7 @@
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus ELIGIBLE -> q
     1:22:void <clinit>():43:64 -> <clinit>
     1:1:void <init>(java.lang.String,int):41:41 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.ir.optimize.u0.c:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.ir.optimize.w0.c:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set definiteReceiverAliases -> c
     boolean $assertionsDisabled -> e
@@ -34563,12 +34626,12 @@
     53:53:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):78 -> a
     54:64:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):79:89 -> a
     65:66:boolean exceedsInstructionBudgetAfterIncrement(int):95:96 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo -> com.android.tools.r8.ir.optimize.u0.d:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo -> com.android.tools.r8.ir.optimize.w0.d:
     java.util.List callsReceiver -> a
     com.android.tools.r8.utils.OptionalBool returnsReceiver -> b
     boolean hasMonitorOnReceiver -> c
     1:4:void <init>(java.util.List,com.android.tools.r8.utils.OptionalBool,boolean):29:32 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverAnalysis -> com.android.tools.r8.ir.optimize.u0.e:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverAnalysis -> com.android.tools.r8.ir.optimize.w0.e:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.Value receiver -> d
     boolean $assertionsDisabled -> f
@@ -34580,13 +34643,13 @@
     2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):42:50 -> <init>
     1:21:com.android.tools.r8.utils.OptionalBool computeReturnsReceiver():54:74 -> a
     22:35:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):83:96 -> a
-    36:37:boolean com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement.isRelatedTo(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):87:88 -> a
+    36:37:boolean com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement.isRelatedTo(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):90:91 -> a
     36:37:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):96 -> a
     38:73:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):98:133 -> a
     74:74:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):115:115 -> a
     75:75:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):110:110 -> a
     1:2:com.android.tools.r8.utils.OptionalBool getOrComputeIsReceiverAlias(com.android.tools.r8.ir.code.Value):78:79 -> b
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.ir.optimize.u0.f:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.ir.optimize.w0.f:
     java.util.Set maybeReceiverAliases -> c
     java.util.Set illegalReceiverAliases -> d
     boolean $assertionsDisabled -> f
@@ -34615,7 +34678,7 @@
     5:5:boolean verifyReceiverSetsAreDisjoint():124 -> c
     6:6:boolean verifyReceiverSetsAreDisjoint():124:124 -> c
     1:1:java.util.List lambda$addDeferredAliasValidityCheck$0(com.android.tools.r8.ir.code.Value):84:84 -> d
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.ir.optimize.u0.g:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.ir.optimize.w0.g:
     com.android.tools.r8.ir.code.Instruction root -> c
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.ir.code.Value defaultValue -> e
@@ -34630,7 +34693,7 @@
     1:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):50:57 -> a
     9:45:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):86:122 -> a
     46:75:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):128:157 -> 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):1045:1045 -> 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):1049:1049 -> a
     76:76:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):156 -> a
     77:81:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):156:160 -> a
     82:82:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):29:29 -> a
@@ -34638,7 +34701,7 @@
     83:86:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):162:165 -> a
     1:3:com.android.tools.r8.ir.code.Value getValueForFieldRead(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):63:65 -> b
     4:16:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.ir.optimize.u0.j:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.ir.optimize.w0.j:
     com.android.tools.r8.com.google.common.collect.ImmutableSet ALLOWED_ZERO_TEST_TYPES -> p
     com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet receivers -> o
     com.android.tools.r8.graph.AppView appView -> a
@@ -34679,10 +34742,10 @@
     92:92:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> a
     92:92:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod):713 -> a
     92:92:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):275 -> a
-    93:97:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod):717:721 -> a
-    93:97:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):275 -> a
-    98:108:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod):717:727 -> a
-    98:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):275 -> a
+    93:98:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod):717:717 -> a
+    93:98:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):275 -> a
+    105:108:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod):724:727 -> a
+    105:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):275 -> a
     109:133:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):277:301 -> a
     134:174:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):978:1018 -> a
     134:174:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):302 -> a
@@ -34703,7 +34766,7 @@
     212:220:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):354:362 -> a
     221:243:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):467:489 -> a
     221:243:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):363 -> a
-    244:244:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):273:273 -> a
+    244:244:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):274:274 -> a
     244:244:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):489 -> a
     244:244:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):363 -> a
     245:255:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):490:500 -> a
@@ -34745,12 +34808,12 @@
     502:502:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$2(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):634:634 -> a
     503:551:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):741:789 -> a
     503:551:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):839 -> a
-    552:552:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):273:273 -> a
+    552:552:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):274:274 -> a
     552:552:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):789 -> a
     552:552:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):839 -> a
     553:555:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):792:794 -> a
     553:555:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):839 -> a
-    556:556:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):273:273 -> a
+    556:556:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):274:274 -> a
     556:556:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):794 -> a
     556:556:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):839 -> a
     557:557:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):798:798 -> a
@@ -34813,12 +34876,12 @@
     7:7:java.lang.Object com.android.tools.r8.utils.ListUtils.first(java.util.List):16:16 -> g
     7:7:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():518 -> g
     8:21:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():518:531 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.ir.optimize.u0.h:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.ir.optimize.w0.h:
     com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind MAYBE -> b
     com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind DEFINITE -> a
     1:2:void <clinit>():77:78 -> <clinit>
     1:1:void <init>(java.lang.String,int):76:76 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.ir.optimize.u0.i:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.ir.optimize.w0.i:
     1:1:void <init>():1189:1189 -> <init>
 com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.a:
     com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo INSTANCE -> d
@@ -34849,7 +34912,7 @@
     1:5:void <init>(int,boolean):38:42 -> <init>
     com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo() -> a
     1:10:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):47:56 -> a
-    11:14:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.AbstractValue.join(com.android.tools.r8.ir.analysis.value.AbstractValue):60:63 -> a
+    11:14:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.AbstractValue.join(com.android.tools.r8.ir.analysis.value.AbstractValue):64:67 -> a
     11:14:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):56 -> a
     15:30:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):57:72 -> a
     31:39:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):71:79 -> a
@@ -34884,57 +34947,55 @@
     boolean valueHasBeenPropagated() -> j
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():19:19 -> k
 com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.e:
-    boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> m
-    boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> o
-    boolean UNKNOWN_RETURN_VALUE_ONLY_DEPENDS_ON_ARGUMENTS -> p
-    boolean DOES_NOT_USE_IDENTIFIER_NAME_STRING -> i
-    boolean UNKNOWN_CHECKS_NULL_RECEIVER_BEFORE_ANY_SIDE_EFFECT -> j
-    com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo UNKNOWN_PARAMETER_USAGE_INFO -> n
-    boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> k
+    boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> n
+    boolean UNKNOWN_RETURN_VALUE_ONLY_DEPENDS_ON_ARGUMENTS -> o
+    boolean UNKNOWN_CHECKS_NULL_RECEIVER_BEFORE_ANY_SIDE_EFFECT -> i
+    com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo UNKNOWN_PARAMETER_USAGE_INFO -> m
+    boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> j
+    boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> l
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement UNKNOWN_CLASS_TYPE -> h
-    java.util.BitSet NO_NULL_PARAMETER_OR_THROW_FACTS -> q
+    java.util.BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS -> q
     java.util.Set UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT -> b
+    java.util.BitSet NO_NULL_PARAMETER_OR_THROW_FACTS -> p
     int UNKNOWN_RETURNED_ARGUMENT -> c
-    java.util.BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS -> r
-    boolean $assertionsDisabled -> s
+    boolean $assertionsDisabled -> r
     com.android.tools.r8.ir.analysis.value.AbstractValue UNKNOWN_ABSTRACT_RETURN_VALUE -> f
-    com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo UNKNOWN_CLASS_INLINER_ELIGIBILITY -> l
+    com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo UNKNOWN_CLASS_INLINER_ELIGIBILITY -> k
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo DEFAULT_INSTANCE -> a
     boolean UNKNOWN_NEVER_RETURNS_NORMALLY -> e
     boolean UNKNOWN_NEVER_RETURNS_NULL -> d
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement UNKNOWN_TYPE -> g
-    1:21:void <clinit>():20:40 -> <clinit>
-    1:1:void <init>():42:42 -> <init>
-    1:1:java.util.Set getInitializedClassesOnNormalExit():81:81 -> A
-    1:1:boolean isInitializerEnablingJavaAssertions():148:148 -> B
-    1:1:java.util.BitSet getNonNullParamOrThrow():97:97 -> C
-    1:1:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):91:91 -> a
-    2:2:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():193:193 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():102:102 -> b
+    1:20:void <clinit>():20:39 -> <clinit>
+    1:1:void <init>():41:41 -> <init>
+    boolean isInitializerEnablingJavaAssertions() -> A
+    java.util.BitSet getNonNullParamOrThrow() -> B
+    1:1:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):90:90 -> a
+    2:2:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():187:187 -> a
+    java.util.BitSet getNonNullParamOnNormalExits() -> b
     boolean cannotBeKept() -> c
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():71:71 -> d
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():168:168 -> e
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType() -> d
+    boolean checksNullReceiverBeforeAnySideEffect() -> e
     boolean returnValueHasBeenPropagated() -> f
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():143:143 -> g
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():142:142 -> g
     boolean classInitializerMayBePostponed() -> h
-    1:2:int getReturnedArgument():122:123 -> i
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo():86:86 -> j
-    1:1:boolean returnValueOnlyDependsOnArguments():183:183 -> k
+    1:2:int getReturnedArgument():121:122 -> i
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo():85:85 -> j
+    boolean returnValueOnlyDependsOnArguments() -> k
     boolean neverInline() -> l
-    1:1:boolean neverReturnsNormally():133:133 -> m
-    1:1:boolean useIdentifierNameString():153:153 -> n
-    1:1:boolean triggersClassInitBeforeAnySideEffect():173:173 -> o
-    boolean returnsArgument() -> p
-    boolean isUpdatableMethodOptimizationInfo() -> q
-    1:1:boolean neverReturnsNull():128:128 -> r
-    boolean isReachabilitySensitive() -> s
-    com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> t
-    boolean forceInline() -> u
-    boolean isDefaultMethodOptimizationInfo() -> v
-    1:1:boolean mayHaveSideEffects():178:178 -> w
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():76:76 -> x
-    boolean hasBeenInlinedIntoSingleCallSite() -> y
-    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo getClassInlinerEligibility():138:138 -> z
+    boolean neverReturnsNormally() -> m
+    boolean triggersClassInitBeforeAnySideEffect() -> n
+    boolean returnsArgument() -> o
+    boolean isUpdatableMethodOptimizationInfo() -> p
+    boolean neverReturnsNull() -> q
+    boolean isReachabilitySensitive() -> r
+    com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> s
+    boolean forceInline() -> t
+    boolean isDefaultMethodOptimizationInfo() -> u
+    1:1:boolean mayHaveSideEffects():172:172 -> v
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> w
+    boolean hasBeenInlinedIntoSingleCallSite() -> x
+    com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo getClassInlinerEligibility() -> y
+    1:1:java.util.Set getInitializedClassesOnNormalExit():80:80 -> z
 com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.f:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
@@ -34948,9 +35009,8 @@
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> i
     boolean valueHasBeenPropagated() -> j
 com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.g:
-    java.util.Set getInitializedClassesOnNormalExit() -> A
-    boolean isInitializerEnablingJavaAssertions() -> B
-    java.util.BitSet getNonNullParamOrThrow() -> C
+    boolean isInitializerEnablingJavaAssertions() -> A
+    java.util.BitSet getNonNullParamOrThrow() -> B
     com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int) -> a
     com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy() -> a
     java.util.BitSet getNonNullParamOnNormalExits() -> b
@@ -34965,19 +35025,19 @@
     boolean returnValueOnlyDependsOnArguments() -> k
     boolean neverInline() -> l
     boolean neverReturnsNormally() -> m
-    boolean useIdentifierNameString() -> n
-    boolean triggersClassInitBeforeAnySideEffect() -> o
-    boolean returnsArgument() -> p
-    boolean isUpdatableMethodOptimizationInfo() -> q
-    boolean neverReturnsNull() -> r
-    boolean isReachabilitySensitive() -> s
-    com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> t
-    boolean forceInline() -> u
-    boolean isDefaultMethodOptimizationInfo() -> v
-    boolean mayHaveSideEffects() -> w
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> x
-    boolean hasBeenInlinedIntoSingleCallSite() -> y
-    com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo getClassInlinerEligibility() -> z
+    boolean triggersClassInitBeforeAnySideEffect() -> n
+    boolean returnsArgument() -> o
+    boolean isUpdatableMethodOptimizationInfo() -> p
+    boolean neverReturnsNull() -> q
+    boolean isReachabilitySensitive() -> r
+    com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> s
+    boolean forceInline() -> t
+    boolean isDefaultMethodOptimizationInfo() -> u
+    boolean mayHaveSideEffects() -> v
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> w
+    boolean hasBeenInlinedIntoSingleCallSite() -> x
+    com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo getClassInlinerEligibility() -> y
+    java.util.Set getInitializedClassesOnNormalExit() -> z
 com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.ir.optimize.info.g$a:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference NeverInline -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference ForceInline -> b
@@ -35019,7 +35079,7 @@
     118:118:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):385:385 -> a
     118:118:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):361 -> a
     118:118:void collectMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization):131 -> a
-    119:119:boolean com.android.tools.r8.graph.DexClass.definesFinalizer(com.android.tools.r8.graph.DexItemFactory):850:850 -> a
+    119:119:boolean com.android.tools.r8.graph.DexClass.definesFinalizer(com.android.tools.r8.graph.DexItemFactory):855:855 -> a
     119:119:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):385 -> a
     119:119:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):361 -> a
     119:119:void collectMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization):131 -> a
@@ -35077,7 +35137,7 @@
     821:825:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):213:217 -> a
     826:895:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):192:261 -> a
     896:896:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):257:257 -> a
-    897:897:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):273:273 -> a
+    897:897:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):274:274 -> a
     897:897:boolean lambda$identifyClassInlinerEligibility$0(com.android.tools.r8.ir.code.AliasedValueConfiguration,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):177 -> a
     898:898:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):626:626 -> a
     899:915: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):629:645 -> a
@@ -35119,8 +35179,8 @@
     1234:1236:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):921:923 -> a
     1237:1238:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():263:264 -> a
     1237:1238:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):923 -> a
-    1239:1241:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):923:925 -> a
-    1242:1253:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):923:934 -> a
+    1239:1242:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):923:923 -> a
+    1245:1253:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):926:934 -> a
     1254:1254:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):953:953 -> a
     1254:1254:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):934 -> a
     1255:1255:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
@@ -35197,27 +35257,26 @@
     22:22:void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):179:179 -> a
     23:23:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):189:189 -> a
     24:24:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):209:209 -> a
-    25:25:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):226:226 -> a
-    26:26:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):232:232 -> a
-    27:28:void setInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):238:239 -> a
-    29:29:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):250:250 -> a
-    30:30:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):255:255 -> a
-    1:2:void updateVisibleOptimizationInfo():70:71 -> b
-    3:17:void updateVisibleOptimizationInfo():70:84 -> b
+    25:25:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):221:221 -> a
+    26:26:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):227:227 -> a
+    27:28:void setInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):233:234 -> a
+    29:29:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):245:245 -> a
+    30:30:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):250:250 -> a
+    1:3:void updateVisibleOptimizationInfo():70:70 -> b
+    5:17:void updateVisibleOptimizationInfo():72:84 -> b
     18:18:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):72:72 -> b
     19:19:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):101:101 -> b
-    20:20:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):220:220 -> b
-    21:21:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):244:244 -> b
-    22:22:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):260:260 -> b
+    20:20:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):215:215 -> b
+    21:21:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):239:239 -> b
+    22:22:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):255:255 -> b
     1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):38:43 -> c
     7:7:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):194:194 -> c
     1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):142:142 -> d
     1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):199:199 -> e
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):214:214 -> f
-    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):184:184 -> g
-    1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):265:265 -> h
-    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):147:147 -> i
-    1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):49:54 -> j
+    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):184:184 -> f
+    1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):260:260 -> g
+    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):147:147 -> h
+    1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):49:54 -> i
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.ir.optimize.info.m:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
     1:1:void <clinit>():23:23 -> <clinit>
@@ -35247,10 +35306,9 @@
     void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
     void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod) -> d
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> e
-    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> f
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> g
-    void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> h
-    void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> i
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> f
+    void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> g
+    void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> h
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.m$a:
     1:1:void <init>():23:23 -> <init>
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.ir.optimize.info.n:
@@ -35278,14 +35336,13 @@
     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):35:35 -> b
-    2:2:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):171:171 -> b
+    2:2:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):166:166 -> b
     void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
     1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):74:74 -> d
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> e
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):144:144 -> f
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> g
-    void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> h
-    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> i
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> f
+    void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> g
+    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> h
 com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.ir.optimize.info.o:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
@@ -35337,10 +35394,10 @@
     21:28:boolean note(com.android.tools.r8.ir.code.InstancePut):216:223 -> a
     21:28:boolean note(com.android.tools.r8.ir.code.Instruction):170 -> a
     29:33:boolean note(com.android.tools.r8.ir.code.Instruction):172:176 -> a
-    34:35:boolean note(com.android.tools.r8.ir.code.Return):242:243 -> a
-    34:35:boolean note(com.android.tools.r8.ir.code.Instruction):176 -> a
-    36:38:boolean note(com.android.tools.r8.ir.code.Return):242:244 -> a
-    36:38:boolean note(com.android.tools.r8.ir.code.Instruction):176 -> a
+    34:36:boolean note(com.android.tools.r8.ir.code.Return):242:242 -> a
+    34:36:boolean note(com.android.tools.r8.ir.code.Instruction):176 -> a
+    38:38:boolean note(com.android.tools.r8.ir.code.Return):244:244 -> a
+    38:38:boolean note(com.android.tools.r8.ir.code.Instruction):176 -> a
     39:40:boolean note(com.android.tools.r8.ir.code.Instruction):178:179 -> a
     41:43:boolean note(com.android.tools.r8.ir.code.Monitor):249:251 -> a
     41:43:boolean note(com.android.tools.r8.ir.code.Instruction):179 -> a
@@ -35369,84 +35426,82 @@
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement returnsObjectWithUpperBoundType -> d
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractReturnValue -> c
     com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo classInlinerEligibility -> g
-    1:98:void <clinit>():22:119 -> <clinit>
-    1:1:void <init>():124:124 -> <init>
-    2:100:void <init>():24:122 -> <init>
-    101:101:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):130:130 -> <init>
-    102:220:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):24:142 -> <init>
-    1:1:java.util.Set getInitializedClassesOnNormalExit():223:223 -> A
-    1:1:boolean isInitializerEnablingJavaAssertions():293:293 -> B
-    1:1:java.util.BitSet getNonNullParamOrThrow():238:238 -> C
-    1:27:void adjustOptimizationInfoAfterRemovingThisParameter():471:497 -> D
-    28:28:void markCheckNullReceiverBeforeAnySideEffect(boolean):445:445 -> D
-    28:28:void adjustOptimizationInfoAfterRemovingThisParameter():497 -> D
-    29:29:void adjustOptimizationInfoAfterRemovingThisParameter():500:500 -> D
-    30:30:void markTriggerClassInitBeforeAnySideEffect(boolean):449:449 -> D
-    30:30:void adjustOptimizationInfoAfterRemovingThisParameter():500 -> D
-    31:50:void adjustOptimizationInfoAfterRemovingThisParameter():503:522 -> D
-    1:1:void markAsPropagated():454:454 -> E
-    1:1:void markCannotBeKept():199:199 -> F
-    1:1:void markClassInitializerMayBePostponed():208:208 -> G
-    1:2:void markForceInline():421:422 -> H
-    1:1:void markInlinedIntoSingleCallSite():252:252 -> I
-    1:1:void markMayNotHaveSideEffects():370:370 -> J
-    1:2:void markNeverInline():435:436 -> K
-    1:1:void markNeverReturnsNormally():382:382 -> L
-    1:1:void markNeverReturnsNull():378:378 -> M
-    1:1:void markReturnValueOnlyDependsOnArguments():374:374 -> N
-    1:1:void markUseIdentifierNameString():441:441 -> O
-    1:1:void setInitializerEnablingJavaAssertions():356:356 -> P
-    1:2:void unsetForceInline():428:429 -> Q
-    1:7:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):147:153 -> a
-    8:8:void setFlag(int):166:166 -> a
-    8:8:void setFlag(int,boolean):159 -> a
-    9:9:void clearFlag(int):170:170 -> a
-    9:9:void setFlag(int,boolean):161 -> a
-    10:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):233:233 -> a
-    11:11:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):332:332 -> a
-    12:12:void setNonNullParamOnNormalExits(java.util.BitSet):340:340 -> a
-    13:13:void setClassInlinerEligibility(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):348:348 -> a
-    14:14:void setInstanceInitializerInfo(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):352:352 -> a
-    15:15:void markInitializesClassesOnNormalExit(java.util.Set):360:360 -> a
-    16:18:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):386:388 -> a
-    19:28:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):392:401 -> a
-    29:32:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):400:403 -> a
-    33:39:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):407:413 -> a
-    40:45:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):410:415 -> a
-    46:46:void markCheckNullReceiverBeforeAnySideEffect(boolean):445:445 -> a
-    47:48:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():464:465 -> a
-    1:1:void clearFlag(int):170:170 -> b
-    2:2:java.util.BitSet getNonNullParamOnNormalExits():243:243 -> b
-    3:3:void setNonNullParamOrThrow(java.util.BitSet):336:336 -> b
-    4:4:void markTriggerClassInitBeforeAnySideEffect(boolean):449:449 -> b
-    1:1:boolean isFlagSet(int):174:174 -> c
-    2:2:boolean cannotBeKept():194:194 -> c
-    3:3:void setReachabilitySensitive(boolean):344:344 -> c
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():213:213 -> d
-    2:4:void markReturnsArgument(int):364:366 -> d
-    1:1:void setFlag(int):166:166 -> e
-    2:2:boolean checksNullReceiverBeforeAnySideEffect():313:313 -> e
-    1:1:boolean returnValueHasBeenPropagated():459:459 -> f
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():288:288 -> g
-    1:1:boolean classInitializerMayBePostponed():204:204 -> h
-    1:2:int getReturnedArgument():267:268 -> i
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo():228:228 -> j
-    1:1:boolean returnValueOnlyDependsOnArguments():328:328 -> k
-    1:1:boolean neverInline():308:308 -> l
-    1:1:boolean neverReturnsNormally():278:278 -> m
-    1:1:boolean useIdentifierNameString():298:298 -> n
-    1:1:boolean triggersClassInitBeforeAnySideEffect():318:318 -> o
-    1:1:boolean returnsArgument():262:262 -> p
-    boolean isUpdatableMethodOptimizationInfo() -> q
-    1:1:boolean neverReturnsNull():273:273 -> r
-    1:1:boolean isReachabilitySensitive():257:257 -> s
-    com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> t
-    1:1:boolean forceInline():303:303 -> u
-    boolean isDefaultMethodOptimizationInfo() -> v
-    1:1:boolean mayHaveSideEffects():323:323 -> w
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():218:218 -> x
-    1:1:boolean hasBeenInlinedIntoSingleCallSite():248:248 -> y
-    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo getClassInlinerEligibility():283:283 -> z
+    1:96:void <clinit>():22:117 -> <clinit>
+    1:1:void <init>():122:122 -> <init>
+    2:98:void <init>():24:120 -> <init>
+    99:99:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):128:128 -> <init>
+    100:216:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):24:140 -> <init>
+    1:1:boolean isInitializerEnablingJavaAssertions():291:291 -> A
+    1:1:java.util.BitSet getNonNullParamOrThrow():236:236 -> B
+    1:26:void adjustOptimizationInfoAfterRemovingThisParameter():459:484 -> C
+    27:27:void markCheckNullReceiverBeforeAnySideEffect(boolean):433:433 -> C
+    27:27:void adjustOptimizationInfoAfterRemovingThisParameter():484 -> C
+    28:28:void adjustOptimizationInfoAfterRemovingThisParameter():487:487 -> C
+    29:29:void markTriggerClassInitBeforeAnySideEffect(boolean):437:437 -> C
+    29:29:void adjustOptimizationInfoAfterRemovingThisParameter():487 -> C
+    30:49:void adjustOptimizationInfoAfterRemovingThisParameter():490:509 -> C
+    1:1:void markAsPropagated():442:442 -> D
+    1:1:void markCannotBeKept():197:197 -> E
+    1:1:void markClassInitializerMayBePostponed():206:206 -> F
+    1:2:void markForceInline():414:415 -> G
+    1:1:void markInlinedIntoSingleCallSite():250:250 -> H
+    1:1:void markMayNotHaveSideEffects():363:363 -> I
+    1:2:void markNeverInline():428:429 -> J
+    1:1:void markNeverReturnsNormally():375:375 -> K
+    1:1:void markNeverReturnsNull():371:371 -> L
+    1:1:void markReturnValueOnlyDependsOnArguments():367:367 -> M
+    1:1:void setInitializerEnablingJavaAssertions():349:349 -> N
+    1:2:void unsetForceInline():421:422 -> O
+    1:7:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):145:151 -> a
+    8:8:void setFlag(int):164:164 -> a
+    8:8:void setFlag(int,boolean):157 -> a
+    9:9:void clearFlag(int):168:168 -> a
+    9:9:void setFlag(int,boolean):159 -> a
+    10:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):231:231 -> a
+    11:11:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):325:325 -> a
+    12:12:void setNonNullParamOnNormalExits(java.util.BitSet):333:333 -> a
+    13:13:void setClassInlinerEligibility(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):341:341 -> a
+    14:14:void setInstanceInitializerInfo(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo):345:345 -> a
+    15:15:void markInitializesClassesOnNormalExit(java.util.Set):353:353 -> a
+    16:18:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):379:381 -> a
+    19:28:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):385:394 -> a
+    29:32:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):393:396 -> a
+    33:39:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):400:406 -> a
+    40:45:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):403:408 -> a
+    46:46:void markCheckNullReceiverBeforeAnySideEffect(boolean):433:433 -> a
+    47:48:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():452:453 -> a
+    1:1:void clearFlag(int):168:168 -> b
+    2:2:java.util.BitSet getNonNullParamOnNormalExits():241:241 -> b
+    3:3:void setNonNullParamOrThrow(java.util.BitSet):329:329 -> b
+    4:4:void markTriggerClassInitBeforeAnySideEffect(boolean):437:437 -> b
+    1:1:boolean isFlagSet(int):172:172 -> c
+    2:2:boolean cannotBeKept():192:192 -> c
+    3:3:void setReachabilitySensitive(boolean):337:337 -> c
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():211:211 -> d
+    2:4:void markReturnsArgument(int):357:359 -> d
+    1:1:void setFlag(int):164:164 -> e
+    2:2:boolean checksNullReceiverBeforeAnySideEffect():306:306 -> e
+    1:1:boolean returnValueHasBeenPropagated():447:447 -> f
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():286:286 -> g
+    1:1:boolean classInitializerMayBePostponed():202:202 -> h
+    1:2:int getReturnedArgument():265:266 -> i
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo():226:226 -> j
+    1:1:boolean returnValueOnlyDependsOnArguments():321:321 -> k
+    1:1:boolean neverInline():301:301 -> l
+    1:1:boolean neverReturnsNormally():276:276 -> m
+    1:1:boolean triggersClassInitBeforeAnySideEffect():311:311 -> n
+    1:1:boolean returnsArgument():260:260 -> o
+    boolean isUpdatableMethodOptimizationInfo() -> p
+    1:1:boolean neverReturnsNull():271:271 -> q
+    1:1:boolean isReachabilitySensitive():255:255 -> r
+    com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> s
+    1:1:boolean forceInline():296:296 -> t
+    boolean isDefaultMethodOptimizationInfo() -> u
+    1:1:boolean mayHaveSideEffects():316:316 -> v
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():216:216 -> w
+    1:1:boolean hasBeenInlinedIntoSingleCallSite():246:246 -> x
+    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo getClassInlinerEligibility():281:281 -> y
+    1:1:java.util.Set getInitializedClassesOnNormalExit():221:221 -> z
 com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.ir.optimize.info.s.a:
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
@@ -35513,7 +35568,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():130:130 -> e
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():139:139 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():144:144 -> g
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.ir.optimize.v0.a:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.ir.optimize.x0.a:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> b
     com.android.tools.r8.ir.optimize.Inliner inliner -> c
@@ -35525,17 +35580,17 @@
     20:22:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):53 -> a
     23:25:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):54:56 -> a
     26:27:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):36:37 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.ir.optimize.v0.b:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.ir.optimize.x0.b:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):15:16 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.ir.optimize.v0.c:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.ir.optimize.x0.c:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:23 -> a
     5:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:36 -> a
     10:10:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.ir.optimize.v0.d:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.ir.optimize.x0.d:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map cache -> d
@@ -35549,9 +35604,9 @@
     2:3:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):43 -> a
     4:4:boolean verifyIRCacheIsEmpty():53:53 -> a
     1:7:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):32:38 -> b
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.ir.optimize.v0.e:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.ir.optimize.x0.e:
     com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.v0.f:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.x0.f:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -35591,7 +35646,7 @@
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
     boolean unsetReasonHasBeenReportedFlag() -> z
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.v0.g:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.x0.g:
     1:1:void <init>():18:18 -> <init>
     void reportBlacklisted() -> a
     void reportIncorrectArity(int,int) -> a
@@ -35630,7 +35685,7 @@
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
     boolean unsetReasonHasBeenReportedFlag() -> z
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.ir.optimize.v0.h:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.ir.optimize.x0.h:
     com.android.tools.r8.graph.DexEncodedMethod callee -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexEncodedMethod context -> b
@@ -35643,12 +35698,9 @@
     12:12:void printWithExceededThreshold(java.lang.String,java.lang.String,int,int):47:47 -> a
     13:13:void reportBlacklisted():52:52 -> a
     14:14:void reportIncorrectArity(int,int):92:92 -> a
-    15:19:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):146:150 -> a
-    20:20:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):146:146 -> a
-    21:25:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):219:223 -> a
-    26:26:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):219:219 -> a
-    27:29:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):229:231 -> a
-    30:30:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):229:229 -> a
+    15:20:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):146:146 -> a
+    21:26:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):219:219 -> a
+    27:30:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):229:229 -> a
     31:31:void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction):237:237 -> a
     1:1:void reportCallerNotSameClass():57:57 -> b
     2:2:void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int):184:184 -> b
@@ -35679,7 +35731,7 @@
     1:1:void reportRecursiveMethod():209:209 -> x
     1:1:void reportUnknownTarget():214:214 -> y
     1:2:boolean unsetReasonHasBeenReportedFlag():270:271 -> z
-com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.w0.a:
+com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.y0.a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList SINGLE_LIST -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList EMPTY_LIST -> a
     boolean $assertionsDisabled -> c
@@ -35700,7 +35752,7 @@
     83:83:java.lang.String getCaptureSignature(com.android.tools.r8.graph.DexTypeList):116:116 -> a
     84:84:com.android.tools.r8.graph.DexType lambda$getCaptureSignature$2(com.android.tools.r8.graph.DexTypeList,int):116:116 -> a
     85:110:int mapFieldIntoCaptureIndex(java.lang.String,java.util.List,com.android.tools.r8.graph.DexField):123:148 -> a
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.ir.optimize.w0.d:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.ir.optimize.y0.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
@@ -35772,7 +35824,7 @@
     84:88:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):347:351 -> a
     84:88:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
     1:5:void processCode():187:191 -> b
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.w0.b:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.y0.b:
     1:1:void <init>():76:76 -> <init>
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
@@ -35784,7 +35836,7 @@
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
     boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.ir.optimize.w0.c:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.ir.optimize.y0.c:
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
@@ -35795,7 +35847,7 @@
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
     boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.ir.optimize.w0.g:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.ir.optimize.y0.g:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
     com.android.tools.r8.graph.DexType classType -> b
@@ -35829,14 +35881,14 @@
     1:2:void remove(com.android.tools.r8.graph.DexType):136:137 -> e
     1:1:boolean isTrivial():127:127 -> f
     1:1:int size():73:73 -> g
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.ir.optimize.w0.e:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.ir.optimize.y0.e:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     int id -> a
     1:3:void <init>(int,com.android.tools.r8.graph.DexProgramClass):57:59 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.ir.optimize.w0.f:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.ir.optimize.y0.f:
     boolean reportable -> a
     1:2:void <init>(java.lang.String,boolean):225:226 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.w0.h:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.y0.h:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -35852,9 +35904,9 @@
     com.android.tools.r8.graph.DexTypeList buildInterfaces() -> g
     com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods() -> h
     com.android.tools.r8.graph.DexType getSuperClassType() -> i
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.ir.optimize.w0.i:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.ir.optimize.y0.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.w0.q:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.ir.optimize.y0.q:
     java.util.Map lambdas -> a
     com.android.tools.r8.kotlin.Kotlin kotlin -> f
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode mode -> h
@@ -35922,8 +35974,8 @@
     1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):90:90 -> d
     2:14:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):242:254 -> d
     15:15:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):249:249 -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.ir.optimize.w0.j:
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.ir.optimize.w0.k:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.ir.optimize.y0.j:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.ir.optimize.y0.k:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> m
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):474:474 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):475:479 -> <init>
@@ -35935,12 +35987,12 @@
     5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):501:501 -> a
     6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):506:506 -> a
     7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):511:511 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.ir.optimize.w0.l:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.ir.optimize.y0.l:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):100:100 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):100:100 -> <init>
     1:1:void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):104:104 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.ir.optimize.w0.m:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.ir.optimize.y0.m:
     java.util.Map lambdaGroups -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> b
@@ -35951,7 +36003,7 @@
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     2:2:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod):123 -> a
     3:33:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod):123:153 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.w0.n:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.y0.n:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> m
     java.util.Set typeAffectedValues -> n
@@ -35971,7 +36023,7 @@
     1:28:void processCode():546:573 -> b
     29:45:void processCode():572:588 -> b
     46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):592:592 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.w0.o:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.y0.o:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
@@ -35982,12 +36034,12 @@
     1:1:java.lang.Object apply(java.lang.Object):630:630 -> apply
     2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):641:645 -> apply
     2:6:java.lang.Object apply(java.lang.Object):630 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.ir.optimize.w0.p:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.ir.optimize.y0.p:
     1:1:void <init>():92:92 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):92:92 -> <init>
     void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
     void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.w0.r:
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.y0.r:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -36025,7 +36077,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.w0.s.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.ir.optimize.y0.s.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -36038,36 +36090,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.w0.s.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.ir.optimize.y0.s.g:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1):103:103 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):105:105 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):110:110 -> a
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):103 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):116:116 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.w0.s.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.w0.s.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.y0.s.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.y0.s.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):179:179 -> <init>
     1:4:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):190:193 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):194:194 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():184:184 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.w0.s.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.y0.s.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):151:151 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):156:156 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):163:170 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):166:166 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.w0.s.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.y0.s.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):129:129 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():144:144 -> a
     java.lang.String getLambdaKindDescriptor() -> c
     1:1:boolean equals(java.lang.Object):134:134 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.w0.s.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.y0.s.f:
     com.android.tools.r8.graph.DexMethod objectInitializer -> n
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):212:213 -> <init>
-    1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):220:225 -> c
-    7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):220:220 -> c
+    1:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):220:220 -> c
     1:1:void prepareSuperConstructorCall(int):218:218 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.w0.s.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.y0.s.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -36101,39 +36152,38 @@
     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 -> b
     40:40:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> b
     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 -> b
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.w0.s.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.y0.s.n:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1):109:109 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):111:111 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):116:116 -> a
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):109 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):122:122 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.w0.s.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.w0.s.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.y0.s.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.y0.s.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):190:190 -> <init>
     1:7:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):201:207 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):205:205 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():195:195 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.w0.s.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.y0.s.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):157:157 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):162:162 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):169:181 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):177:177 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.w0.s.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.y0.s.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):135:135 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():150:150 -> a
     java.lang.String getLambdaKindDescriptor() -> c
     1:1:boolean equals(java.lang.Object):140:140 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.w0.s.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.y0.s.m:
     int arity -> n
     com.android.tools.r8.graph.DexMethod lambdaInitializer -> o
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position):226:229 -> <init>
     5:5: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):228:228 -> <init>
     1:1:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):235:235 -> c
-    2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):238:243 -> c
-    8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):238:238 -> c
+    2:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):238:238 -> c
     1:3:void prepareSuperConstructorCall(int):234:236 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.w0.s.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.y0.s.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -36174,7 +36224,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 -> b
     40:40:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> b
     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 -> b
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.w0.s.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.y0.s.p:
     com.android.tools.r8.graph.DexField idField -> l
     java.util.function.IntFunction fieldGenerator -> m
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):25:27 -> <init>
@@ -36183,7 +36233,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.w0.s.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.ir.optimize.y0.s.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
@@ -36269,7 +36319,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.w0.s.r:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.y0.s.r:
     com.android.tools.r8.graph.FieldAccessFlags CAPTURE_FIELD_FLAGS -> j
     com.android.tools.r8.graph.FieldAccessFlags SINGLETON_FIELD_FLAGS -> i
     com.android.tools.r8.graph.MethodAccessFlags CLASS_INITIALIZER_FLAGS -> c
@@ -36282,7 +36332,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.w0.s.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.ir.optimize.y0.s.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -36304,8 +36354,7 @@
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> b
     1:1:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57 -> b
     2:8:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57:63 -> b
-    9:10:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:47 -> b
-    11:11:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:46 -> b
+    9:11:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:46 -> b
     12:12:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy getCodeStrategy():83:83 -> b
     1:1:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67:67 -> c
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> e
@@ -36317,7 +36366,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.w0.s.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.y0.s.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():43:43 -> <clinit>
@@ -36354,7 +36403,7 @@
     26:26:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():121 -> h
     27:46:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():116:135 -> h
     1:3:java.util.Map collectVirtualMethods():143:145 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.w0.s.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.y0.s.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -36364,13 +36413,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):1045:1045 -> 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):1049:1049 -> 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):1045:1045 -> 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):1049:1049 -> 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
@@ -36412,11 +36461,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):1045:1045 -> 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):1049:1049 -> 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):1045:1045 -> 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):1049:1049 -> 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
@@ -36425,7 +36474,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.w0.s.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.y0.s.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -36445,7 +36494,7 @@
     java.lang.String getLambdaKindDescriptor() -> 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.w0.s.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.y0.s.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -36526,7 +36575,7 @@
     51:51:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):221:221 -> c
     51:51:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):147 -> c
     52:52:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):147:147 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.w0.s.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.y0.s.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -36537,12 +36586,13 @@
     3:6:boolean lambda$prepareInstructions$2(int,int[],int[],com.android.tools.r8.ir.conversion.IRBuilder):65 -> a
     7:14:void lambda$prepareInstructions$5(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.IRBuilder):89:96 -> a
     1:1:void lambda$prepareInstructions$0(int,com.android.tools.r8.ir.conversion.IRBuilder):55:55 -> b
-    1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):70:70 -> c
+    1:1:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1091:1091 -> c
+    1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):70 -> c
     1:1:void lambda$prepareInstructions$4(int,com.android.tools.r8.ir.conversion.IRBuilder):71:71 -> d
     1:1:void lambda$prepareInstructions$6(int,com.android.tools.r8.ir.conversion.IRBuilder):102:102 -> e
     1:1:void lambda$prepareInstructions$7(int,com.android.tools.r8.ir.conversion.IRBuilder):103:103 -> f
     1:65:void prepareInstructions():41:105 -> h
-com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.ir.optimize.x0.a:
+com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.ir.optimize.z0.a:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):27:29 -> <init>
@@ -36555,35 +36605,68 @@
     14:22:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):47 -> a
     23:23:void optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):76:76 -> a
     23:23:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):47 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.x0.b:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.z0.b:
+    com.android.tools.r8.graph.DexType getType() -> a
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodOptimizer -> com.android.tools.r8.ir.optimize.x0.c:
+com.android.tools.r8.ir.optimize.library.LibraryMethodOptimizer -> com.android.tools.r8.ir.optimize.z0.c:
     java.util.Map libraryMethodModelCollections -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):32:32 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView):29:34 -> <init>
-    1:3:void register(com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):38:40 -> a
-    4:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):48:48 -> a
-    5:5:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
-    5:5:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):49 -> a
-    6:11:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):50:55 -> a
-    12:14:void optimizeInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):72:74 -> a
-    12:14:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):57 -> a
-    15:17:void optimizeInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):73:75 -> a
-    15:17:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):57 -> a
-    18:19:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):61:62 -> a
+    2:11:void <init>(com.android.tools.r8.graph.AppView):29:38 -> <init>
+    1:3:void register(com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):43:45 -> a
+    4:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):53:53 -> a
+    5:5:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
+    5:5:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):54 -> a
+    6:11:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):55:60 -> a
+    12:14:void optimizeInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):77:79 -> a
+    12:14:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):62 -> a
+    15:17:void optimizeInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):78:80 -> a
+    15:17:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):62 -> a
+    18:19:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):66:67 -> a
     20:20:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    20:20:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):62 -> a
-    21:21:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):62:62 -> a
-com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.x0.d:
+    20:20:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):67 -> a
+    21:21:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):67:67 -> a
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.ir.optimize.z0.d:
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexMethod wtfMethod -> i
+    com.android.tools.r8.graph.DexMethod eMethod -> h
+    com.android.tools.r8.graph.DexMethod wMethod -> g
+    com.android.tools.r8.graph.DexMethod iMethod -> f
+    com.android.tools.r8.graph.DexType logType -> b
+    com.android.tools.r8.graph.DexMethod dMethod -> e
+    com.android.tools.r8.graph.DexMethod vMethod -> d
+    com.android.tools.r8.graph.DexMethod isLoggableMethod -> c
+    1:10:void <init>(com.android.tools.r8.graph.AppView):41:50 -> <init>
+    11:19:void <init>(com.android.tools.r8.graph.AppView):48:56 -> <init>
+    20:28:void <init>(com.android.tools.r8.graph.AppView):54:62 -> <init>
+    29:37:void <init>(com.android.tools.r8.graph.AppView):60:68 -> <init>
+    38:46:void <init>(com.android.tools.r8.graph.AppView):66:74 -> <init>
+    47:55:void <init>(com.android.tools.r8.graph.AppView):72:80 -> <init>
+    56:64:void <init>(com.android.tools.r8.graph.AppView):78:86 -> <init>
+    65:65:void <init>(com.android.tools.r8.graph.AppView):84:84 -> <init>
+    1:1:boolean isEnabled(com.android.tools.r8.graph.AppView):92:92 -> a
+    2:2:com.android.tools.r8.graph.DexType getType():97:97 -> a
+    3:37:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):107:141 -> a
+    38:41:void replaceInvokeWithConstNumber(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,int):148:151 -> a
+com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.z0.e:
     com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
-    1:1:com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection getInstance():24:24 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.ir.optimize.y0.a:
+    1:1:com.android.tools.r8.graph.DexType getType():29:29 -> a
+    1:1:com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection getInstance():24:24 -> b
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.ir.optimize.z0.f:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
+    com.android.tools.r8.graph.AppView appView -> a
+    1:3:void <init>(com.android.tools.r8.graph.AppView):26:28 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getType():33:33 -> a
+    2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):43:43 -> a
+    3:9:void optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):50:56 -> a
+    3:9:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):44 -> a
+    10:33:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):68:91 -> a
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.ir.optimize.A0.a:
     1:1:java.util.List nonDestructivePeepholes():22:22 -> a
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):37 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):37:37 -> a
@@ -36597,10 +36680,10 @@
     35:35:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
     35:35:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):71 -> a
     36:40:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):71:75 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.ir.optimize.y0.b:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.ir.optimize.A0.b:
     boolean match(com.android.tools.r8.ir.code.InstructionListIterator) -> a
     boolean resetAfterMatch() -> a
-com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.ir.optimize.y0.c:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.ir.optimize.A0.c:
     com.android.tools.r8.ir.optimize.peepholes.Point dup3Exp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point dup2Exp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point dup1Exp -> a
@@ -36611,7 +36694,7 @@
     2:39:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:78 -> a
     1:1:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):33:33 -> b
     1:1:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35:35 -> c
-com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.ir.optimize.y0.d:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.ir.optimize.A0.d:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point lastLoadExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
@@ -36620,10 +36703,10 @@
     1:8:void <init>():30:37 -> <init>
     boolean resetAfterMatch() -> a
     1:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:64 -> a
-com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.ir.optimize.y0.e:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.ir.optimize.A0.e:
     java.util.List instructions -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[],java.util.List):14:16 -> <init>
-com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.ir.optimize.y0.f:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.ir.optimize.A0.f:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoad -> d
     com.android.tools.r8.ir.code.Instruction insertPosition -> c
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> f
@@ -36644,12 +36727,12 @@
     32:32:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):73 -> a
     33:59:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):76:102 -> a
     1:10:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):51:60 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.ir.optimize.y0.g:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.ir.optimize.A0.g:
     int getMin() -> a
     void setIndex(int) -> a
     java.util.function.Predicate getPredicate() -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.ir.optimize.y0.h:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.ir.optimize.A0.h:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -36661,7 +36744,7 @@
     1:1:void resetPrevious(com.android.tools.r8.ir.code.InstructionListIterator,int):31:31 -> b
     2:5:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):36:39 -> b
     6:6:boolean lambda$moveInstructionsUpToCurrentPosition$2(java.util.List,com.android.tools.r8.ir.code.Instruction):70:70 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.ir.optimize.y0.i:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.ir.optimize.A0.i:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -36676,7 +36759,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction lambda$test$4(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> e
     1:1:void lambda$test$5(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> f
     1:4:com.android.tools.r8.ir.optimize.peepholes.Match test(com.android.tools.r8.ir.code.InstructionListIterator):37:40 -> g
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.ir.optimize.y0.j:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.ir.optimize.A0.j:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -36688,14 +36771,14 @@
     3:3:com.android.tools.r8.ir.code.Instruction get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     1:1:java.util.function.Predicate getPredicate():21:21 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.ir.optimize.y0.k:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.ir.optimize.A0.k:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
     1:6:void <init>():22:27 -> <init>
     boolean resetAfterMatch() -> a
     1:18:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):31:48 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.ir.optimize.y0.l:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.ir.optimize.A0.l:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> d
@@ -36707,7 +36790,7 @@
     boolean resetAfterMatch() -> a
     1:1:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):37:37 -> a
     2:39:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):43:80 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.ir.optimize.y0.m:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.ir.optimize.A0.m:
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> c
     com.android.tools.r8.ir.code.Store store -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> f
@@ -36721,7 +36804,7 @@
     9:50:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):85:126 -> a
     1:10:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56:65 -> b
     1:4:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):72:75 -> c
-com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.ir.optimize.y0.n:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.ir.optimize.A0.n:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -36733,7 +36816,7 @@
     3:3:java.util.List get(com.android.tools.r8.ir.optimize.peepholes.Match):42:42 -> a
     1:1:java.util.function.Predicate getPredicate():22:22 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.ir.optimize.z0.d:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.ir.optimize.B0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.concurrent.ConcurrentHashMap candidates -> d
@@ -36798,8 +36881,8 @@
     436:436:boolean lambda$analyzeAllValueUsers$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):588:588 -> a
     437:437:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):640:640 -> a
     1:1:boolean lambda$isValidInitCall$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):464:464 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.ir.optimize.z0.a:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.ir.optimize.z0.b:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.ir.optimize.B0.a:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.ir.optimize.B0.b:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):643:643 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):645:646 -> <init>
@@ -36816,7 +36899,7 @@
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):703:703 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):708:708 -> registerStaticFieldWrite
     1:3:boolean registerTypeReference(com.android.tools.r8.graph.DexType):713:715 -> registerTypeReference
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.ir.optimize.z0.c:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.ir.optimize.B0.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -36832,13 +36915,13 @@
     2:18:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):61:77 -> <init>
     1:1:com.android.tools.r8.graph.DexType hostType():85:85 -> a
     1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():95:95 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.ir.optimize.z0.e:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.ir.optimize.B0.e:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):22:28 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):21:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):33:35 -> mapInvocationType
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.ir.optimize.z0.f:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.ir.optimize.B0.f:
     java.util.Set methodsToBeStaticized -> g
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
@@ -36849,156 +36932,156 @@
     java.util.Map hostClassInits -> f
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
     java.util.Map singletonFields -> h
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):73:73 -> <init>
-    2:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):61:76 -> <init>
-    1:4:void lambda$run$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):91:94 -> a
-    5:5:void lambda$run$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):100:100 -> a
-    6:59:void finalEligibilityCheck():127:180 -> a
-    60:60:com.android.tools.r8.graph.DexItemFactory factory():725:725 -> a
-    60:60:void finalEligibilityCheck():180 -> a
-    61:71:void finalEligibilityCheck():180:190 -> a
-    72:101:void finalEligibilityCheck():189:218 -> a
-    102:115:void finalEligibilityCheck():217:230 -> a
-    116:116:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.StaticGet):210:210 -> a
-    117:118:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):267:268 -> a
-    119:119:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder lambda$enqueueMethodsWithCodeOptimizations$5(com.android.tools.r8.graph.DexEncodedMethod):268:268 -> a
-    120:121:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):284:285 -> a
-    122:127:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):284:289 -> a
-    128:128:void lambda$processMethodsConcurrently$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):286:286 -> a
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):75:75 -> <init>
+    2:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):63:78 -> <init>
+    1:4:void lambda$run$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):93:96 -> a
+    5:5:void lambda$run$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):102:102 -> a
+    6:59:void finalEligibilityCheck():129:182 -> a
+    60:60:com.android.tools.r8.graph.DexItemFactory factory():728:728 -> a
+    60:60:void finalEligibilityCheck():182 -> a
+    61:71:void finalEligibilityCheck():182:192 -> a
+    72:101:void finalEligibilityCheck():191:220 -> a
+    102:115:void finalEligibilityCheck():219:232 -> a
+    116:116:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.StaticGet):212:212 -> a
+    117:118:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):269:270 -> a
+    119:119:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder lambda$enqueueMethodsWithCodeOptimizations$5(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
+    120:122:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):286:286 -> a
+    127:127:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):291:291 -> a
+    128:128:void lambda$processMethodsConcurrently$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
     129:129:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):294:294 -> a
-    129:129:void lambda$removeCandidateInstantiation$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):330 -> a
-    130:134:void forEachMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):297:301 -> a
-    135:135:void lambda$forEachMethod$7(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):299:299 -> a
-    136:136:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode):305:305 -> a
-    137:137:java.util.function.Consumer collectOptimizationInfo(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):309:309 -> a
-    138:138:void lambda$collectOptimizationInfo$8(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):309:309 -> a
-    139:139:boolean lambda$rewriteReferences$10(com.android.tools.r8.ir.code.StaticGet):349:349 -> a
-    140:147:void lambda$rewriteReferences$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):354:361 -> a
+    129:129:void lambda$removeCandidateInstantiation$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):333 -> a
+    130:134:void forEachMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):299:303 -> a
+    135:135:void lambda$forEachMethod$7(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):301:301 -> a
+    136:136:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode):307:307 -> a
+    137:137:java.util.function.Consumer collectOptimizationInfo(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):311:311 -> a
+    138:138:void lambda$collectOptimizationInfo$8(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):312:312 -> a
+    139:139:boolean lambda$rewriteReferences$10(com.android.tools.r8.ir.code.StaticGet):352:352 -> a
+    140:147:void lambda$rewriteReferences$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):357:364 -> a
     148:148:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):294:294 -> a
-    148:148:void lambda$rewriteReferences$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):362 -> a
-    149:169:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):373:393 -> a
-    170:174:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):400:404 -> a
-    175:192:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):403:420 -> a
-    193:216:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):459:482 -> a
-    217:222:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):490:495 -> a
-    223:240:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):494:511 -> a
-    241:250:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):515:524 -> a
-    251:251:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
-    251:251:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):524 -> a
-    252:259:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):525:532 -> a
+    148:148:void lambda$rewriteReferences$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):365 -> a
+    149:169:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):376:396 -> a
+    170:174:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):403:407 -> a
+    175:192:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):406:423 -> a
+    193:216:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):462:485 -> a
+    217:222:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):493:498 -> a
+    223:240:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):497:514 -> a
+    241:250:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):518:527 -> a
+    251:251:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1049:1049 -> a
+    251:251:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):527 -> a
+    252:259:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):528:535 -> a
     260:260:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> a
-    260:260:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):531 -> a
+    260:260:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):534 -> a
     261:261:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
     261:261:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298 -> a
-    261:261:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):531 -> a
-    262:262:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):591:591 -> a
-    263:263:com.android.tools.r8.graph.DexItemFactory factory():725:725 -> a
-    263:263:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):593 -> a
-    264:266:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):593:595 -> a
-    267:267:com.android.tools.r8.graph.DexItemFactory factory():725:725 -> a
-    267:267:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):597 -> a
-    268:268:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):597:597 -> a
-    269:272:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):645:648 -> a
-    273:273:boolean lambda$classMembersConflict$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):647:647 -> a
-    274:274:boolean lambda$classMembersConflict$13(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):648:648 -> a
-    275:275: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):717:717 -> a
-    276:276:com.android.tools.r8.graph.DexItemFactory factory():725:725 -> a
-    276:276: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):718 -> a
-    277:278: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):719:720 -> a
-    279:279: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):718:718 -> a
-    1:1:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):82:82 -> b
-    2:5:void prepareCandidates():237:240 -> b
-    2:5:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):85 -> b
+    261:261:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):534 -> a
+    262:262:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):594:594 -> a
+    263:263:com.android.tools.r8.graph.DexItemFactory factory():728:728 -> a
+    263:263:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):596 -> a
+    264:266:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):596:598 -> a
+    267:267:com.android.tools.r8.graph.DexItemFactory factory():728:728 -> a
+    267:267:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):600 -> a
+    268:268:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):600:600 -> a
+    269:272:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):648:651 -> a
+    273:273:boolean lambda$classMembersConflict$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):650:650 -> a
+    274:274:boolean lambda$classMembersConflict$13(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):651:651 -> a
+    275:275: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):720:720 -> a
+    276:276:com.android.tools.r8.graph.DexItemFactory factory():728:728 -> a
+    276:276: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):721 -> a
+    277:278: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):722:723 -> a
+    279:279: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):721:721 -> a
+    1:1:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):84:84 -> b
+    2:5:void prepareCandidates():239:242 -> b
+    2:5:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):87 -> b
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():89:89 -> b
-    6:6:void prepareCandidates():242 -> b
-    6:6:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):85 -> b
+    6:6:void prepareCandidates():244 -> b
+    6:6:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):87 -> b
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():89 -> b
-    7:7:void prepareCandidates():242 -> b
-    7:7:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):85 -> b
+    7:7:void prepareCandidates():244 -> b
+    7:7:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):87 -> b
     8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():90:90 -> b
-    8:8:void prepareCandidates():242 -> b
-    8:8:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):85 -> b
-    9:17:void prepareCandidates():243:251 -> b
-    9:17:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):85 -> b
-    18:18:com.android.tools.r8.graph.DexItemFactory factory():725:725 -> b
-    18:18:void prepareCandidates():252 -> b
-    18:18:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):85 -> b
-    19:28:void prepareCandidates():252:261 -> b
-    19:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):85 -> b
-    29:30:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):88:89 -> b
-    31:46:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):88:103 -> b
-    47:58:java.util.Set staticizeMethodSymbols():603:614 -> b
-    47:58:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
-    59:59:com.android.tools.r8.graph.DexItemFactory factory():725:725 -> b
-    59:59:java.util.Set staticizeMethodSymbols():615 -> b
-    59:59:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
-    60:73:java.util.Set staticizeMethodSymbols():615:628 -> b
-    60:73:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
+    8:8:void prepareCandidates():244 -> b
+    8:8:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):87 -> b
+    9:17:void prepareCandidates():245:253 -> b
+    9:17:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):87 -> b
+    18:18:com.android.tools.r8.graph.DexItemFactory factory():728:728 -> b
+    18:18:void prepareCandidates():254 -> b
+    18:18:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):87 -> b
+    19:28:void prepareCandidates():254:263 -> b
+    19:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):87 -> b
+    29:31:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):90:90 -> b
+    42:46:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):101:105 -> b
+    47:58:java.util.Set staticizeMethodSymbols():606:617 -> b
+    47:58:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
+    59:59:com.android.tools.r8.graph.DexItemFactory factory():728:728 -> b
+    59:59:java.util.Set staticizeMethodSymbols():618 -> b
+    59:59:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
+    60:73:java.util.Set staticizeMethodSymbols():618:631 -> b
+    60:73:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
     74:74:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
-    74:74:java.util.Set staticizeMethodSymbols():628 -> b
-    74:74:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
-    75:76:java.util.Set staticizeMethodSymbols():629:630 -> b
-    75:76:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
-    77:115:void moveMembersIntoHost(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):657:695 -> b
-    77:115:java.util.Set staticizeMethodSymbols():632 -> b
-    77:115:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
-    116:116:com.android.tools.r8.graph.DexItemFactory factory():725:725 -> b
-    116:116:void moveMembersIntoHost(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):697 -> b
-    116:116:java.util.Set staticizeMethodSymbols():632 -> b
-    116:116:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
-    117:117:void moveMembersIntoHost(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):697:697 -> b
-    117:117:java.util.Set staticizeMethodSymbols():632 -> b
-    117:117:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
-    118:134:void moveMembersIntoHost(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):696:712 -> b
-    118:134:java.util.Set staticizeMethodSymbols():632 -> b
-    118:134:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
-    135:136:java.util.Set staticizeMethodSymbols():638:639 -> b
-    135:136:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> b
-    137:148:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):112:123 -> b
-    149:152:void lambda$run$2(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):117:120 -> b
-    153:153:boolean lambda$finalEligibilityCheck$3(com.android.tools.r8.graph.DexEncodedMethod):172:172 -> b
-    154:166:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):313:325 -> b
-    167:167:com.android.tools.r8.graph.DexItemFactory factory():725:725 -> b
-    167:167:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):325 -> b
-    168:173:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):325:330 -> b
+    74:74:java.util.Set staticizeMethodSymbols():631 -> b
+    74:74:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
+    75:76:java.util.Set staticizeMethodSymbols():632:633 -> b
+    75:76:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
+    77:115:void moveMembersIntoHost(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):660:698 -> b
+    77:115:java.util.Set staticizeMethodSymbols():635 -> b
+    77:115:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
+    116:116:com.android.tools.r8.graph.DexItemFactory factory():728:728 -> b
+    116:116:void moveMembersIntoHost(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):700 -> b
+    116:116:java.util.Set staticizeMethodSymbols():635 -> b
+    116:116:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
+    117:117:void moveMembersIntoHost(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):700:700 -> b
+    117:117:java.util.Set staticizeMethodSymbols():635 -> b
+    117:117:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
+    118:134:void moveMembersIntoHost(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):699:715 -> b
+    118:134:java.util.Set staticizeMethodSymbols():635 -> b
+    118:134:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
+    135:136:java.util.Set staticizeMethodSymbols():641:642 -> b
+    135:136:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):109 -> b
+    137:148:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):114:125 -> b
+    149:152:void lambda$run$2(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):119:122 -> b
+    153:153:boolean lambda$finalEligibilityCheck$3(com.android.tools.r8.graph.DexEncodedMethod):174:174 -> b
+    154:166:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):316:328 -> b
+    167:167:com.android.tools.r8.graph.DexItemFactory factory():728:728 -> b
+    167:167:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):328 -> b
+    168:173:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):328:333 -> b
     174:174:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):294:294 -> b
-    174:174:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):331 -> b
-    175:175:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):336:336 -> b
-    1:1:void removeReferencesToThis(com.android.tools.r8.ir.code.IRCode):340:340 -> c
-    1:21:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):346:366 -> d
-    22:22:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> d
-    22:22:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):538 -> d
-    22:22:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
-    23:36:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):539:552 -> d
-    23:36:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
-    37:39:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):551:553 -> d
-    37:39:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
-    40:40:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):550:550 -> d
-    40:40:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
+    174:174:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):334 -> b
+    175:175:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode):339:339 -> b
+    1:1:void removeReferencesToThis(com.android.tools.r8.ir.code.IRCode):343:343 -> c
+    1:21:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):349:369 -> d
+    22:22:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> d
+    22:22:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):541 -> d
+    22:22:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
+    23:36:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):542:555 -> d
+    23:36:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
+    37:39:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):554:556 -> d
+    37:39:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
+    40:40:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):553:553 -> d
+    40:40:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
     41:41:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> d
-    41:41:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):548 -> d
-    41:41:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
-    42:46:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):559:563 -> d
-    42:46:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
+    41:41:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):551 -> d
+    41:41:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
+    42:46:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):562:566 -> d
+    42:46:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
     47:47:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> d
-    47:47:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):563 -> d
-    47:47:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
-    48:51:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):568:571 -> d
-    48:51:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
-    52:52:com.android.tools.r8.graph.DexItemFactory factory():725:725 -> d
-    52:52:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):573 -> d
-    52:52:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
-    53:61:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):573:581 -> d
-    53:61:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
-    62:64:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):580:582 -> d
-    62:64:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
-    65:69:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):579:583 -> d
-    65:69:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
+    47:47:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):566 -> d
+    47:47:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
+    48:51:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):571:574 -> d
+    48:51:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
+    52:52:com.android.tools.r8.graph.DexItemFactory factory():728:728 -> d
+    52:52:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):576 -> d
+    52:52:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
+    53:61:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):576:584 -> d
+    53:61:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
+    62:64:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):583:585 -> d
+    62:64:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
+    65:69:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):582:586 -> d
+    65:69:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
     70:70:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> d
-    70:70:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):583 -> d
-    70:70:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):367 -> d
+    70:70:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):586 -> d
+    70:70:void rewriteReferences(com.android.tools.r8.ir.code.IRCode):370 -> d
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.ir.optimize.string.a:
     boolean isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType) -> a
     boolean isBuilderType(com.android.tools.r8.graph.DexType) -> a
@@ -37041,19 +37124,15 @@
     25:28:void logResults():133:136 -> a
     29:32:void logResults():135:138 -> a
     33:61:void logResults():137:165 -> a
-    62:63:void lambda$logResults$0(java.lang.Integer,java.lang.Integer):144:145 -> a
-    64:64:void lambda$logResults$0(java.lang.Integer,java.lang.Integer):144:144 -> a
+    62:64:void lambda$logResults$0(java.lang.Integer,java.lang.Integer):144:144 -> a
     65:80:void computeTrivialStringConcatenation(com.android.tools.r8.ir.code.IRCode):173:188 -> a
     81:81:boolean lambda$computeTrivialStringConcatenation$4(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,com.android.tools.r8.ir.code.Value):180:180 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$1100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> b
-    2:3:void lambda$logResults$1(java.lang.Integer,java.lang.Integer):151:152 -> b
-    4:4:void lambda$logResults$1(java.lang.Integer,java.lang.Integer):151:151 -> b
+    2:4:void lambda$logResults$1(java.lang.Integer,java.lang.Integer):151:151 -> b
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo access$1200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> c
-    2:3:void lambda$logResults$2(java.lang.Integer,java.lang.Integer):159:160 -> c
-    4:4:void lambda$logResults$2(java.lang.Integer,java.lang.Integer):159:159 -> c
+    2:4:void lambda$logResults$2(java.lang.Integer,java.lang.Integer):159:159 -> c
     1:1:int access$1308(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> d
-    2:3:void lambda$logResults$3(java.lang.Integer,java.lang.Integer):166:167 -> d
-    4:4:void lambda$logResults$3(java.lang.Integer,java.lang.Integer):166:166 -> d
+    2:4:void lambda$logResults$3(java.lang.Integer,java.lang.Integer):166:166 -> d
     1:1:int access$1408(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> e
     1:1:int access$1508(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> f
     1:1:int access$1608(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> g
@@ -37133,7 +37212,7 @@
     212:228:void logHistogramOfChains(java.util.List,boolean):551:567 -> a
     229:229:void logHistogramOfChains(java.util.List,boolean):562:562 -> a
     230:231:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):578:579 -> a
-    232:232:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    232:232:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     232:232:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):579 -> a
     233:269:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):580:616 -> a
     270:275:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):614:619 -> a
@@ -37148,7 +37227,7 @@
     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):625 -> a
     318:318:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):625:625 -> a
-    319:319:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    319:319:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     319:319:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):579 -> a
     320:346:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):631:657 -> a
     320:346:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):581 -> a
@@ -37157,20 +37236,20 @@
     393:396:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):715 -> a
     397:397:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):716:716 -> a
     398:404:void removeTrivialBuilders():731:737 -> a
-    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     405:405:void removeTrivialBuilders():737 -> a
     406:418:void removeTrivialBuilders():738:750 -> a
-    419:419:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    419:419:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     419:419:void removeTrivialBuilders():750 -> a
     420:449:void removeTrivialBuilders():751:780 -> a
-    450:450:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    450:450:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     450:450:void removeTrivialBuilders():780 -> a
     451:460:void removeTrivialBuilders():781:790 -> a
-    461:461:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    461:461:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     461:461:void removeTrivialBuilders():780 -> a
-    462:462:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    462:462:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     462:462:void removeTrivialBuilders():750 -> a
-    463:463:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    463:463:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
     463:463:void removeTrivialBuilders():737 -> 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):472:510 -> b
@@ -37193,12 +37272,10 @@
     1:3:void logResult():78:80 -> a
     4:7:void logResult():79:82 -> a
     8:34:void logResult():81:107 -> a
-    35:36:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):86:87 -> a
-    37:37:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):86:86 -> a
-    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
+    35:37:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):86:86 -> a
+    38:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:100 -> a
     41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):133:136 -> a
-    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> 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
@@ -37209,13 +37286,13 @@
     123:123:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
     123:123:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):207 -> a
     124:183:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):208:267 -> a
-    184:184:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
+    184:184:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> 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):1059:1059 -> a
+    193:193:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> 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):1059:1059 -> a
+    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1063:1063 -> a
     203:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):289 -> a
     204:204:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):292:292 -> a
     205:205:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
@@ -37228,50 +37305,48 @@
     214:214:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):235:235 -> a
     215:215:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):241:241 -> a
     216:219:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):304:307 -> a
-    220:220:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
-    220:220:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):309 -> a
-    221:262:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310:351 -> a
+    220:220:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> a
+    220:220:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):308 -> a
+    221:262:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):309:350 -> a
     263:263:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    263:263:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):354 -> a
-    264:321:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):359:416 -> a
-    322:323:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):397:398 -> a
+    263:263:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):353 -> a
+    264:321:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):358:415 -> a
+    322:323:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):396:397 -> a
     324:324:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
-    324:324:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):399 -> a
-    325:354:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):419:448 -> a
-    355:358:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):446:449 -> a
+    324:324:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):398 -> a
+    325:354:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418:447 -> a
+    355:358:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):445:448 -> a
     359:359:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
-    359:359:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):450 -> a
-    360:366:void logHistogramOfNames(com.android.tools.r8.graph.DexString):480:486 -> a
-    360:366:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451 -> a
-    367:367:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453:453 -> a
+    359:359:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):449 -> a
+    360:366:void logHistogramOfNames(com.android.tools.r8.graph.DexString):475:481 -> a
+    360:366:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):450 -> a
+    367:367:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):452:452 -> a
     368:368:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
-    368:368:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):454 -> a
-    369:377:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):501:509 -> a
-    369:377:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):456 -> a
-    378:379:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):461:462 -> a
+    368:368:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453 -> a
+    369:377:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):496:504 -> a
+    369:377:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):454 -> a
+    378:379:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):459:460 -> a
     380:380:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    380:380:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462 -> a
-    381:384:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462:465 -> a
-    385:390:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):491:496 -> a
-    1:2:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:94 -> b
-    3:3:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:93 -> b
-    4:5:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:109 -> b
-    6:6:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:108 -> b
+    380:380:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):460 -> a
+    381:381:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):460:460 -> a
+    382:387:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):486:491 -> a
+    1:3:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:93 -> b
+    4:6:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:108 -> b
     7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):225:225 -> b
     8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):237:237 -> b
     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():965:965 -> 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:43:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):537:541 -> b
+    10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):465:470 -> b
+    16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):512:512 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> b
+    17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):513 -> b
+    18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):514:534 -> b
+    39:43:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):532:536 -> b
     44:44:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> b
-    44:44:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):542 -> b
-    45:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):543:580 -> b
+    44:44:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):537 -> b
+    45:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):538:575 -> b
     83:83:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> b
-    83:83:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):580 -> b
-    84:84:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):580:580 -> b
+    83:83:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):575 -> b
+    84:84:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):575:575 -> b
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):227:227 -> c
     2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):239:239 -> c
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):243:243 -> d
@@ -37283,10 +37358,10 @@
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):233:233 -> j
 com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.ir.optimize.string.c:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
-    1:1:void <clinit>():587:587 -> <clinit>
-    1:1:void <init>():590:590 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():593:593 -> a
-    1:21:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):602:622 -> isLegitimateEscapeRoute
+    1:1:void <clinit>():582:582 -> <clinit>
+    1:1:void <init>():585:585 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():588:588 -> a
+    1:21:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):597:617 -> isLegitimateEscapeRoute
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tools.r8.ir.regalloc.a:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List moveExceptionIntervals -> o
@@ -37323,7 +37398,7 @@
     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:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> 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
@@ -37610,16 +37685,16 @@
     1459:1459:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2330 -> a
     1460:1467:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2331:2338 -> a
     1468:1503:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2446:2481 -> a
-    1504:1504:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    1504:1504:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     1504:1504:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2653 -> a
     1504:1504:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2481 -> a
     1505:1511:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2481:2487 -> a
     1512:1563:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2520:2571 -> a
     1564:1570:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2568:2574 -> a
-    1571:1571:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    1571:1571:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     1571:1571:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574 -> a
     1572:1579:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574:2581 -> a
-    1580:1580:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    1580:1580:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
     1580:1580:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2653 -> a
     1580:1580:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2581 -> a
     1581:1618:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2581:2618 -> a
@@ -37631,7 +37706,7 @@
     1663:1667:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2871:2875 -> a
     1663:1667:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2766 -> a
     1668:1701:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2767:2800 -> a
-    1702:1703:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():793:794 -> a
+    1702:1703:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():794:795 -> a
     1702:1703:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2802 -> a
     1704:1704:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2803:2803 -> a
     1705:1706:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2751:2752 -> a
@@ -37675,14 +37750,14 @@
     98:103:void computeLiveRanges():2492:2497 -> b
     98:103:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     98:103:void allocateRegisters():215 -> b
-    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1220:1220 -> b
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1235:1235 -> b
     104:104:void computeLiveRanges():2497 -> b
     104:104:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     104:104:void allocateRegisters():215 -> b
     105:105:void computeLiveRanges():2497:2497 -> b
     105:105:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     105:105:void allocateRegisters():215 -> b
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1229:1229 -> b
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1244:1244 -> b
     106:106:void computeLiveRanges():2497 -> b
     106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     106:106:void allocateRegisters():215 -> b
@@ -37692,10 +37767,10 @@
     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():965:965 -> b
+    131:131:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> 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():965:965 -> b
+    137:137:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():969:969 -> b
     137:137:void allocateRegisters():229 -> b
     138:138:void allocateRegisters():238:238 -> b
     139:144:void clearState():534:539 -> b
@@ -37717,16 +37792,16 @@
     1:3:int registersUsed():591:593 -> c
     4:9:int unadjustedRealRegisterFromAllocated(int):802:807 -> c
     10:10:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1502 -> c
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1235:1235 -> c
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1250:1250 -> c
     11:11:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
     12:32:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1505:1525 -> c
     33:45:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> c
     46:46:boolean registersAreFree(int,boolean):3112:3112 -> c
     1:1:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1268:1268 -> d
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1283:1283 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1442:1442 -> d
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1457:1457 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     5:23:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
     24:24:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
@@ -37734,12 +37809,12 @@
     25:25:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1472 -> d
     26:26:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
     26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1268:1268 -> d
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1283:1283 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    29:29:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1442:1442 -> d
+    29:29:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1457:1457 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
     30:48:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
@@ -38140,7 +38215,7 @@
     14:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement moveTypeForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):204:206 -> a
     17:19:boolean needsMovesBeforeInstruction(int):213:215 -> a
     20:30:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):284:294 -> a
-    31:31:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    31:31:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1518:1518 -> a
     31:31:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):294 -> a
     32:43:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):299:310 -> a
     44:47:void pruneParallelMoveSets(java.util.Set,java.util.Set,java.util.Set):269:272 -> a
@@ -38161,7 +38236,7 @@
     60:64:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     65:73:void removeArgumentRestores(java.util.Set):332:340 -> a
     74:98:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1204:1204 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1219:1219 -> a
     99:99:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     100:105:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     106:110:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -38190,6 +38265,7 @@
     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
+    2:2:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):88:88 -> toString
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.t.d.a$a:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.ir.code.Position) -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.t.d.g:
@@ -38463,8 +38539,7 @@
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
-    1:2:boolean nextBoolean():129:130 -> nextBoolean
-    3:3:boolean nextBoolean():129:129 -> nextBoolean
+    1: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.u.a.a.a.e.f:
     boolean[] EMPTY_ARRAY -> a
@@ -38638,12 +38713,9 @@
     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
+    6: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
+    6: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
+    6: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
@@ -38686,11 +38758,11 @@
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):310:313 -> b
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):312:312 -> b
     7:25:int compareTo(java.util.List):464:482 -> b
+    1:1:int set(int,int):111:111 -> c
     1:1:void clear():403:403 -> clear
     1:1:int compareTo(java.lang.Object):32:32 -> compareTo
     1:1:void ensureIndex(int):47:47 -> d
     2:2:void ensureIndex(int):46:46 -> d
-    3:3:int set(int,int):111:111 -> d
     int removeInt(int) -> e
     1:14:boolean equals(java.lang.Object):430:443 -> equals
     15:15:boolean valEquals(java.lang.Object,java.lang.Object):407:407 -> equals
@@ -38741,9 +38813,9 @@
     1:3:boolean addAll(int,java.util.Collection):766:768 -> addAll
     1:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):880:883 -> b
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):882:882 -> b
-    1:5:boolean rem(int):888:892 -> c
+    1:2:int set(int,int):786:787 -> c
+    3:7:boolean rem(int):888:892 -> c
     1:1:int compareTo(java.lang.Object):726:726 -> compareTo
-    1:2:int set(int,int):786:787 -> d
     1:3:int removeInt(int):779:781 -> e
     1:2:int getInt(int):773:774 -> get
     1:2:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):606 -> get
@@ -38780,20 +38852,15 @@
     int pos -> a
     1:1:void <clinit>():822:822 -> <clinit>
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList,int):822:823 -> <init>
-    1:4:void add(int):852:855 -> a
-    5:5:void add(int):852:852 -> a
-    1:2:void set(int):859:860 -> b
-    3:3:void set(int):859:859 -> b
-    1:2:int previousInt():839:840 -> d
-    3:3:int previousInt():839:839 -> d
+    1:5:void add(int):852:852 -> a
+    1:3:void set(int):859:859 -> b
+    1:3:int previousInt():839:839 -> d
     1:1:boolean hasNext():826:826 -> hasNext
     1:1:boolean hasPrevious():830:830 -> hasPrevious
     1:1:int nextIndex():844:844 -> nextIndex
-    1:2:int nextInt():834:835 -> nextInt
-    3:3:int nextInt():834:834 -> nextInt
+    1:3:int nextInt():834:834 -> nextInt
     1:1:int previousIndex():848:848 -> previousIndex
-    1:10:void remove():864:873 -> remove
-    11:11:void remove():864:864 -> remove
+    1:11:void remove():864:864 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator -> com.android.tools.r8.u.a.a.a.f.l:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator.<init>():34:34 -> <init>
     1:1:void <init>():35 -> <init>
@@ -38901,12 +38968,9 @@
     int curr -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet):136:137 -> <init>
     1:1:boolean hasNext():141:141 -> hasNext
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry next():147:148 -> next
-    1:2:java.lang.Object next():136 -> next
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry next():147:147 -> next
-    3:3:java.lang.Object next():136 -> next
-    1:5:void remove():153:157 -> remove
-    6:6:void remove():153:153 -> remove
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry next():147:147 -> next
+    1:3:java.lang.Object next():136 -> next
+    1:6:void remove():153:153 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.u.a.a.a.f.s:
     boolean containsKey(int) -> a
     int put(int,int) -> a
@@ -39051,8 +39115,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):552:575 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):552:552 -> <init>
-    1:18:int nextEntry():587:604 -> c
-    19:19:int nextEntry():587:587 -> c
+    1:19:int nextEntry():587:587 -> c
     1:1:boolean hasNext():583:583 -> hasNext
     1:4:void remove():641:644 -> remove
     5:10:void shiftKeys(int):619:624 -> remove
@@ -39198,8 +39261,7 @@
     1:3:boolean containsValue(java.lang.Object):689:691 -> containsValue
     4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator.next():1351:1351 -> containsValue
     4:4:boolean containsValue(java.lang.Object):693 -> containsValue
-    1:2:int firstIntKey():1001:1002 -> d
-    3:3:int firstIntKey():1001:1001 -> d
+    1:3:int firstIntKey():1001:1001 -> d
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> d
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry locateKey(int):262:264 -> e
     4:4:int compare(int,int):232:232 -> e
@@ -39207,8 +39269,7 @@
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry locateKey(int):266:266 -> e
     1:2:java.lang.Object get(int):995:996 -> get
     1:1:void allocatePaths():278:278 -> h
-    1:2:int lastIntKey():1007:1008 -> i
-    3:3:int lastIntKey():1007:1007 -> i
+    1:3:int lastIntKey():1007:1007 -> i
     1:1:boolean isEmpty():990:990 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():41:41 -> keySet
     2:2:java.util.Set keySet():41:41 -> keySet
@@ -39565,18 +39626,15 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1042:1042 -> <init>
     2:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1040:1043 -> <init>
-    1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry nextEntry():1068:1072 -> c
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry nextEntry():1068:1068 -> c
-    1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080:1084 -> h
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080:1080 -> h
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry nextEntry():1068:1068 -> c
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080:1080 -> h
     1:1:boolean hasNext():1056:1056 -> hasNext
     1:1:boolean hasPrevious():1060:1060 -> hasPrevious
     1:1:void updateNext():1064:1064 -> i
     1:1:void updatePrevious():1076:1076 -> j
     1:1:int nextIndex():1088:1088 -> nextIndex
     1:1:int previousIndex():1092:1092 -> previousIndex
-    1:11:void remove():1096:1106 -> remove
-    12:12:void remove():1096:1096 -> remove
+    1:12:void remove():1096:1096 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.u.a.a.a.f.K$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1348:1348 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1348:1348 -> <init>
@@ -39631,12 +39689,9 @@
     int curr -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet):136:137 -> <init>
     1:1:boolean hasNext():141:141 -> hasNext
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry next():147:148 -> next
-    1:2:java.lang.Object next():136 -> next
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry next():147:147 -> next
-    3:3:java.lang.Object next():136 -> next
-    1:6:void remove():153:158 -> remove
-    7:7:void remove():153:153 -> remove
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry next():147:147 -> next
+    1:3:java.lang.Object next():136 -> next
+    1:7:void remove():153:153 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.u.a.a.a.f.Q:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
@@ -39792,8 +39847,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> f
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):486:509 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):486:486 -> <init>
-    1:18:int nextEntry():521:538 -> c
-    19:19:int nextEntry():521:521 -> c
+    1:19:int nextEntry():521:521 -> c
     1:1:boolean hasNext():517:517 -> hasNext
     1:5:void remove():576:580 -> remove
     6:12:void shiftKeys(int):553:559 -> remove
@@ -39887,15 +39941,12 @@
     22:28:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):458:464 -> a
     1:5:void add(int,int):256:260 -> add
     1:3:boolean rem(int):304:306 -> c
+    4:7:int set(int,int):313:313 -> c
     1:1:void clear():321:321 -> clear
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList clone():549:551 -> clone
     1:3:java.lang.Object clone():48 -> clone
-    1:3:int set(int,int):313:315 -> d
-    4:4:int set(int,int):313:313 -> d
-    1:4:int removeInt(int):294:297 -> e
-    5:5:int removeInt(int):294:294 -> e
-    1:2:int getInt(int):274:275 -> getInt
-    3:3:int getInt(int):274:274 -> getInt
+    1:5:int removeInt(int):294:294 -> e
+    1:3:int getInt(int):274:274 -> getInt
     1:2:int indexOf(int):280:281 -> h
     1:2:int lastIndexOf(int):287:288 -> i
     1:1:boolean isEmpty():339:339 -> isEmpty
@@ -39915,18 +39966,14 @@
     int pos -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList,int):494:495 -> <init>
     1:2:void add(int):524:525 -> a
-    1:2:void set(int):529:530 -> b
-    3:3:void set(int):529:529 -> b
-    1:2:int previousInt():511:512 -> d
-    3:3:int previousInt():511:511 -> d
+    1:3:void set(int):529:529 -> b
+    1:3:int previousInt():511:511 -> d
     1:1:boolean hasNext():498:498 -> hasNext
     1:1:boolean hasPrevious():502:502 -> hasPrevious
     1:1:int nextIndex():516:516 -> nextIndex
-    1:2:int nextInt():506:507 -> nextInt
-    3:3:int nextInt():506:506 -> nextInt
+    1:3:int nextInt():506:506 -> nextInt
     1:1:int previousIndex():520:520 -> previousIndex
-    1:9:void remove():534:542 -> remove
-    10:10:void remove():534:534 -> remove
+    1:10:void remove():534:534 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.u.a.a.a.f.e0:
     int size -> b
     1:2:void <init>():55:56 -> <init>
@@ -39954,8 +40001,7 @@
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
-    1:2:int nextInt():129:130 -> nextInt
-    3:3:int nextInt():129:129 -> nextInt
+    1:3:int nextInt():129:129 -> nextInt
     1:2:void remove():135:136 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.u.a.a.a.f.f0:
     int[] EMPTY_ARRAY -> a
@@ -40008,7 +40054,6 @@
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.u.a.a.a.f.l0:
-    int compare(int,int) -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.u.a.a.a.f.m0:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.u.a.a.a.f.q0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
@@ -40022,13 +40067,11 @@
     int curr -> b
     int element -> a
     1:2:void <init>(int):110:111 -> <init>
-    1:3:int previousInt():133:135 -> d
-    4:4:int previousInt():133:133 -> d
+    1:4:int previousInt():133:133 -> d
     1:1:boolean hasNext():116:116 -> hasNext
     1:1:boolean hasPrevious():121:121 -> hasPrevious
     1:1:int nextIndex():140:140 -> nextIndex
-    1:3:int nextInt():126:128 -> nextInt
-    4:4:int nextInt():126:126 -> nextInt
+    1:4:int nextInt():126:126 -> nextInt
     1:1:int previousIndex():145:145 -> previousIndex
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.u.a.a.a.f.p0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> a
@@ -40040,7 +40083,7 @@
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
-    int set(int,int) -> d
+    int set(int,int) -> c
     int removeInt(int) -> e
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.u.a.a.a.f.s0:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.u.a.a.a.f.u0:
@@ -40063,11 +40106,11 @@
     5:5:void add(int,int):85:85 -> add
     1:1:boolean addAll(int,java.util.Collection):105:105 -> addAll
     1:1:boolean rem(int):75:75 -> c
+    2:2:int set(int,int):90:90 -> c
     1:1:java.lang.Object clone():295:295 -> clone
     1:1:int compareTo(java.lang.Object):62:62 -> compareTo
     2:2:int compareTo(java.util.List):290:290 -> compareTo
     2:2:int compareTo(java.lang.Object):62 -> compareTo
-    1:1:int set(int,int):90:90 -> d
     1:1:int removeInt(int):80:80 -> e
     1:1:boolean equals(java.lang.Object):306:306 -> equals
     1:1:java.lang.Integer get(int):144:144 -> get
@@ -40190,8 +40233,7 @@
     1:21:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet):446:466 -> <init>
     22:22:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1):446:446 -> <init>
     1:1:boolean hasNext():474:474 -> hasNext
-    1:15:int nextInt():478:492 -> nextInt
-    16:16:int nextInt():478:478 -> nextInt
+    1:16:int nextInt():478:478 -> nextInt
     1:5:void remove():528:532 -> remove
     6:11:void shiftKeys(int):507:512 -> remove
     6:11:void remove():532 -> remove
@@ -40431,20 +40473,15 @@
     int pos -> a
     1:1:void <clinit>():821:821 -> <clinit>
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList,int):821:822 -> <init>
-    1:2:long previousLong():838:839 -> a
-    3:3:long previousLong():838:838 -> a
-    4:7:void add(long):851:854 -> a
-    8:8:void add(long):851:851 -> a
-    1:2:void set(long):858:859 -> b
-    3:3:void set(long):858:858 -> b
+    1:3:long previousLong():838:838 -> a
+    4:8:void add(long):851:851 -> a
+    1:3:void set(long):858:858 -> b
     1:1:boolean hasNext():825:825 -> hasNext
     1:1:boolean hasPrevious():829:829 -> hasPrevious
     1:1:int nextIndex():843:843 -> nextIndex
-    1:2:long nextLong():833:834 -> nextLong
-    3:3:long nextLong():833:833 -> nextLong
+    1:3:long nextLong():833:833 -> nextLong
     1:1:int previousIndex():847:847 -> previousIndex
-    1:10:void remove():863:872 -> remove
-    11:11:void remove():863:863 -> remove
+    1:11:void remove():863:863 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongListIterator -> com.android.tools.r8.u.a.a.a.g.g:
     1:1:void <init>():35:35 -> <init>
     void add(long) -> a
@@ -40585,8 +40622,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):486:509 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):486:486 -> <init>
-    1:18:int nextEntry():521:538 -> c
-    19:19:int nextEntry():521:521 -> c
+    1:19:int nextEntry():521:521 -> c
     1:1:boolean hasNext():517:517 -> hasNext
     1:5:void remove():576:580 -> remove
     6:12:void shiftKeys(int):553:559 -> remove
@@ -40609,19 +40645,16 @@
     1:5:void add(int,long):256:260 -> a
     6:7:boolean add(long):266:267 -> a
     8:10:void removeElements(int,int):407:409 -> a
-    1:3:long set(int,long):313:315 -> b
-    4:4:long set(int,long):313:313 -> b
+    1:4:long set(int,long):313:313 -> b
     1:3:boolean rem(long):304:306 -> c
     1:1:void clear():321:321 -> clear
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList clone():549:551 -> clone
     1:3:java.lang.Object clone():48 -> clone
     1:2:int indexOf(long):280:281 -> d
     1:2:int lastIndexOf(long):287:288 -> e
-    1:4:long removeLong(int):294:297 -> f
-    5:5:long removeLong(int):294:294 -> f
+    1:5:long removeLong(int):294:294 -> f
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator listIterator(int):493:494 -> g
-    1:2:long getLong(int):274:275 -> getLong
-    3:3:long getLong(int):274:274 -> getLong
+    1:3:long getLong(int):274:274 -> getLong
     1:1:void grow(int):250:250 -> h
     2:5:long[] com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrays.grow(long[],int,int):205:208 -> h
     2:5:void grow(int):250 -> h
@@ -40637,19 +40670,15 @@
     int val$index -> c
     int pos -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList,int):494:495 -> <init>
-    1:2:long previousLong():511:512 -> a
-    3:3:long previousLong():511:511 -> a
+    1:3:long previousLong():511:511 -> a
     4:5:void add(long):524:525 -> a
-    1:2:void set(long):529:530 -> b
-    3:3:void set(long):529:529 -> b
+    1:3:void set(long):529:529 -> b
     1:1:boolean hasNext():498:498 -> hasNext
     1:1:boolean hasPrevious():502:502 -> hasPrevious
     1:1:int nextIndex():516:516 -> nextIndex
-    1:2:long nextLong():506:507 -> nextLong
-    3:3:long nextLong():506:506 -> nextLong
+    1:3:long nextLong():506:506 -> nextLong
     1:1:int previousIndex():520:520 -> previousIndex
-    1:9:void remove():534:542 -> remove
-    10:10:void remove():534:534 -> remove
+    1:10:void remove():534:534 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.u.a.a.a.g.p:
     long previousLong() -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.u.a.a.a.g.q:
@@ -40665,7 +40694,7 @@
     1:1:void <init>():45 -> <init>
     boolean containsValue(boolean) -> a
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,boolean) -> a
-    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.removeBoolean(java.lang.Object) -> b
+    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.removeBoolean(java.lang.Object) -> c
     1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> entrySet
     1:1:java.util.Set entrySet():42 -> entrySet
@@ -40797,7 +40826,7 @@
     1:1:void <init>():45 -> <init>
     boolean containsValue(long) -> a
     long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,long) -> a
-    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.removeLong(java.lang.Object) -> b
+    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.removeLong(java.lang.Object) -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> c
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():761:762 -> c
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():49 -> c
@@ -40977,20 +41006,15 @@
     int pos -> a
     1:1:void <clinit>():616:616 -> <clinit>
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList,int):616:617 -> <init>
-    1:4:void add(java.lang.Object):646:649 -> add
-    5:5:void add(java.lang.Object):646:646 -> add
+    1:5:void add(java.lang.Object):646:646 -> add
     1:1:boolean hasNext():620:620 -> hasNext
     1:1:boolean hasPrevious():624:624 -> hasPrevious
-    1:2:java.lang.Object next():628:629 -> next
-    3:3:java.lang.Object next():628:628 -> next
+    1:3:java.lang.Object next():628:628 -> next
     1:1:int nextIndex():638:638 -> nextIndex
-    1:2:java.lang.Object previous():633:634 -> previous
-    3:3:java.lang.Object previous():633:633 -> previous
+    1:3:java.lang.Object previous():633:633 -> previous
     1:1:int previousIndex():642:642 -> previousIndex
-    1:10:void remove():658:667 -> remove
-    11:11:void remove():658:658 -> remove
-    1:2:void set(java.lang.Object):653:654 -> set
-    3:3:void set(java.lang.Object):653:653 -> set
+    1:11:void remove():658:658 -> remove
+    1:3:void set(java.lang.Object):653:653 -> set
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectListIterator -> com.android.tools.r8.u.a.a.a.h.n:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectBidirectionalIterator.<init>():34:34 -> <init>
     1:1:void <init>():35 -> <init>
@@ -41007,7 +41031,7 @@
     1:1:void <init>():45 -> <init>
     boolean containsValue(boolean) -> a
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,boolean) -> a
-    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.removeBoolean(java.lang.Object) -> b
+    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.removeBoolean(java.lang.Object) -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> c
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():716:717 -> c
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():49 -> c
@@ -41115,7 +41139,7 @@
     1:1:void <init>():45 -> <init>
     boolean containsValue(long) -> a
     long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,long) -> a
-    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.removeLong(java.lang.Object) -> b
+    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.removeLong(java.lang.Object) -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> c
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():761:762 -> c
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():49 -> c
@@ -41236,20 +41260,15 @@
     int pos -> a
     1:1:void <clinit>():575:575 -> <clinit>
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList,int):575:576 -> <init>
-    1:4:void add(java.lang.Object):605:608 -> add
-    5:5:void add(java.lang.Object):605:605 -> add
+    1:5:void add(java.lang.Object):605:605 -> add
     1:1:boolean hasNext():579:579 -> hasNext
     1:1:boolean hasPrevious():583:583 -> hasPrevious
-    1:2:java.lang.Object next():587:588 -> next
-    3:3:java.lang.Object next():587:587 -> next
+    1:3:java.lang.Object next():587:587 -> next
     1:1:int nextIndex():597:597 -> nextIndex
-    1:2:java.lang.Object previous():592:593 -> previous
-    3:3:java.lang.Object previous():592:592 -> previous
+    1:3:java.lang.Object previous():592:592 -> previous
     1:1:int previousIndex():601:601 -> previousIndex
-    1:10:void remove():617:626 -> remove
-    11:11:void remove():617:617 -> remove
-    1:2:void set(java.lang.Object):612:613 -> set
-    3:3:void set(java.lang.Object):612:612 -> set
+    1:11:void remove():617:617 -> remove
+    1:3:void set(java.lang.Object):612:612 -> set
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.android.tools.r8.u.a.a.a.h.z:
     1:1:void <init>():32:32 -> <init>
     1:4:boolean equals(java.lang.Object):41:44 -> equals
@@ -41266,11 +41285,10 @@
     3:4:boolean containsValue(boolean):270:271 -> a
     5:23:boolean put(java.lang.Object,boolean):283:301 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):37:37 -> b
-    2:9:boolean removeBoolean(java.lang.Object):308:315 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):37:37 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet object2BooleanEntrySet():231:231 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2BooleanEntrySet():37 -> c
-    3:5:int findKey(java.lang.Object):235:237 -> c
+    3:10:boolean removeBoolean(java.lang.Object):308:315 -> c
     1:4:void clear():257:260 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap clone():344:349 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -41278,7 +41296,8 @@
     7:7:java.lang.Object clone():37 -> clone
     1:1:boolean containsKey(java.lang.Object):265:265 -> containsKey
     1:1:boolean[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):37:37 -> d
-    2:4:boolean getBoolean(java.lang.Object):244:246 -> d
+    2:4:int findKey(java.lang.Object):235:237 -> d
+    1:3:boolean getBoolean(java.lang.Object):244:246 -> e
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:java.util.Set keySet():37:37 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> keySet
@@ -41302,12 +41321,9 @@
     int curr -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet):136:137 -> <init>
     1:1:boolean hasNext():141:141 -> hasNext
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry next():147:148 -> next
-    1:2:java.lang.Object next():136 -> next
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry next():147:147 -> next
-    3:3:java.lang.Object next():136 -> next
-    1:6:void remove():153:158 -> remove
-    7:7:void remove():153:153 -> remove
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry next():147:147 -> next
+    1:3:java.lang.Object next():136 -> next
+    1:7:void remove():153:153 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.u.a.a.a.h.E:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.u.a.a.a.h.E$a:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.u.a.a.a.h.H:
@@ -41358,12 +41374,9 @@
     int curr -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet):136:137 -> <init>
     1:1:boolean hasNext():141:141 -> hasNext
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry next():147:148 -> next
-    1:2:java.lang.Object next():136 -> next
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry next():147:147 -> next
-    3:3:java.lang.Object next():136 -> next
-    1:6:void remove():153:158 -> remove
-    7:7:void remove():153:153 -> remove
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry next():147:147 -> next
+    1:3:java.lang.Object next():136 -> next
+    1:7:void remove():153:153 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.u.a.a.a.h.I:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
@@ -41403,8 +41416,7 @@
     12:12:java.lang.Object clone():87 -> clone
     1:11:boolean containsKey(java.lang.Object):738:748 -> containsKey
     1:25:void fixPointers(int):899:923 -> f
-    1:2:java.lang.Object firstKey():970:971 -> firstKey
-    3:3:java.lang.Object firstKey():970:970 -> firstKey
+    1:3:java.lang.Object firstKey():970:970 -> firstKey
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet object2IntEntrySet():1422:1423 -> g
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():87 -> g
     3:44:void rehash(int):1709:1750 -> g
@@ -41427,8 +41439,7 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():87 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1531:1532 -> keySet
     3:4:java.util.Set keySet():87 -> keySet
-    1:2:java.lang.Object lastKey():981:982 -> lastKey
-    3:3:java.lang.Object lastKey():981:981 -> lastKey
+    1:3:java.lang.Object lastKey():981:981 -> lastKey
     1:1:void putAll(java.util.Map):296:296 -> putAll
     2:3:void ensureCapacity(int):266:267 -> putAll
     2:3:void putAll(java.util.Map):296 -> putAll
@@ -41482,15 +41493,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1471:1471 -> a
     1:1:void clear():1493:1493 -> clear
     1:1:boolean contains(java.lang.Object):1481:1481 -> contains
-    1:2:java.lang.Object first():1498:1499 -> first
-    3:3:java.lang.Object first():1498:1498 -> first
+    1:3:java.lang.Object first():1498:1498 -> first
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(java.lang.Object):1520:1520 -> headSet
     1:1:java.util.SortedSet headSet(java.lang.Object):1465 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1465:1465 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1465:1465 -> iterator
     3:3:java.util.Iterator iterator():1465:1465 -> iterator
-    1:2:java.lang.Object last():1504:1505 -> last
-    3:3:java.lang.Object last():1504:1504 -> last
+    1:3:java.lang.Object last():1504:1504 -> last
     1:3:boolean remove(java.lang.Object):1486:1488 -> remove
     1:1:int size():1476:1476 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet subSet(java.lang.Object,java.lang.Object):1525:1525 -> subSet
@@ -41522,20 +41531,16 @@
     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>
     1:1:void clear():1373:1373 -> clear
     1:16:boolean contains(java.lang.Object):1309:1324 -> contains
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry first():1296:1297 -> first
-    1:2:java.lang.Object first():1269 -> first
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry first():1296:1296 -> first
-    3:3:java.lang.Object first():1269 -> first
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry first():1296:1296 -> first
+    1:3:java.lang.Object first():1269 -> first
     1:1:java.util.SortedSet headSet(java.lang.Object):1269:1269 -> headSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1286:1286 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1269 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1269:1269 -> iterator
     2:2:java.util.Iterator iterator():1269:1269 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1271:1271 -> iterator
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry last():1302:1303 -> last
-    1:2:java.lang.Object last():1269 -> last
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry last():1302:1302 -> last
-    3:3:java.lang.Object last():1269 -> last
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry last():1302:1302 -> last
+    1:3:java.lang.Object last():1269 -> last
     1:29:boolean remove(java.lang.Object):1331:1359 -> remove
     1:1:int size():1368:1368 -> size
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1269:1269 -> subSet
@@ -41554,12 +41559,10 @@
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1057:1057 -> <init>
     3:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1038:1059 -> <init>
     1:14:void ensureIndexKnown():1099:1112 -> c
-    1:6:int nextEntry():1127:1132 -> h
-    7:7:int nextEntry():1127:1127 -> h
+    1:7:int nextEntry():1127:1127 -> h
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
-    1:6:int previousEntry():1136:1141 -> i
-    7:7:int previousEntry():1136:1136 -> i
+    1:7:int previousEntry():1136:1136 -> i
     1:2:int nextIndex():1117:1118 -> nextIndex
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
@@ -41714,8 +41717,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):541:564 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):541:541 -> <init>
-    1:18:int nextEntry():576:593 -> c
-    19:19:int nextEntry():576:576 -> c
+    1:19:int nextEntry():576:576 -> c
     1:1:boolean hasNext():572:572 -> hasNext
     1:5:void remove():630:634 -> remove
     6:11:void shiftKeys(int):608:613 -> remove
@@ -41760,11 +41762,11 @@
     3:18:long put(java.lang.Object,long):270 -> a
     19:20:long put(java.lang.Object,long):272:273 -> a
     21:25:boolean containsValue(long):404:408 -> a
-    1:12:long removeLong(java.lang.Object):353:364 -> b
-    13:19:void rehash(int):961:967 -> b
-    20:20:int realSize():205:205 -> b
-    20:20:void rehash(int):968 -> b
-    21:33:void rehash(int):969:981 -> b
+    1:7:void rehash(int):961:967 -> b
+    8:8:int realSize():205:205 -> b
+    8:8:void rehash(int):968 -> b
+    9:21:void rehash(int):969:981 -> b
+    1:12:long removeLong(java.lang.Object):353:364 -> c
     1:4:void clear():421:424 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap clone():999:1008 -> clone
     1:10:java.lang.Object clone():49 -> clone
@@ -41867,8 +41869,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):541:564 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):541:541 -> <init>
-    1:18:int nextEntry():576:593 -> c
-    19:19:int nextEntry():576:576 -> c
+    1:19:int nextEntry():576:576 -> c
     1:1:boolean hasNext():572:572 -> hasNext
     1:5:void remove():630:634 -> remove
     6:11:void shiftKeys(int):608:613 -> remove
@@ -41927,8 +41928,7 @@
     13:19:java.lang.Object removeEntry(int):309 -> f
     20:20:void shiftKeys(int):398:398 -> f
     20:20:java.lang.Object removeEntry(int):309 -> f
-    1:2:java.lang.Object firstKey():927:928 -> firstKey
-    3:3:java.lang.Object firstKey():927:927 -> firstKey
+    1:3:java.lang.Object firstKey():927:927 -> firstKey
     1:11:java.lang.Object get(java.lang.Object):701:711 -> get
     1:7:java.lang.Object removeNullEntry():315:321 -> h
     1:1:int realSize():291:291 -> hashCode
@@ -41939,8 +41939,7 @@
     1:1:boolean isEmpty():766:766 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1488:1489 -> keySet
     1:2:java.util.Set keySet():85 -> keySet
-    1:2:java.lang.Object lastKey():938:939 -> lastKey
-    3:3:java.lang.Object lastKey():938:938 -> lastKey
+    1:3:java.lang.Object lastKey():938:938 -> lastKey
     1:26:int insert(java.lang.Object,java.lang.Object):337:362 -> put
     1:26:java.lang.Object put(java.lang.Object,java.lang.Object):369 -> put
     27:28:java.lang.Object put(java.lang.Object,java.lang.Object):371:372 -> put
@@ -41998,15 +41997,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1428:1428 -> a
     1:1:void clear():1450:1450 -> clear
     1:1:boolean contains(java.lang.Object):1438:1438 -> contains
-    1:2:java.lang.Object first():1455:1456 -> first
-    3:3:java.lang.Object first():1455:1455 -> first
+    1:3:java.lang.Object first():1455:1455 -> first
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(java.lang.Object):1477:1477 -> headSet
     1:1:java.util.SortedSet headSet(java.lang.Object):1422 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1422:1422 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1422:1422 -> iterator
     3:3:java.util.Iterator iterator():1422:1422 -> iterator
-    1:2:java.lang.Object last():1461:1462 -> last
-    3:3:java.lang.Object last():1461:1461 -> last
+    1:3:java.lang.Object last():1461:1461 -> last
     1:3:boolean remove(java.lang.Object):1443:1445 -> remove
     1:1:int size():1433:1433 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet subSet(java.lang.Object,java.lang.Object):1482:1482 -> subSet
@@ -42029,20 +42026,16 @@
     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>
     1:1:void clear():1330:1330 -> clear
     1:15:boolean contains(java.lang.Object):1268:1282 -> contains
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry first():1255:1256 -> first
-    1:2:java.lang.Object first():1228 -> first
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry first():1255:1255 -> first
-    3:3:java.lang.Object first():1228 -> first
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry first():1255:1255 -> first
+    1:3:java.lang.Object first():1228 -> first
     1:1:java.util.SortedSet headSet(java.lang.Object):1228:1228 -> headSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1245:1245 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1228 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1228:1228 -> iterator
     2:2:java.util.Iterator iterator():1228:1228 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1230:1230 -> iterator
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry last():1261:1262 -> last
-    1:2:java.lang.Object last():1228 -> last
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry last():1261:1261 -> last
-    3:3:java.lang.Object last():1228 -> last
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry last():1261:1261 -> last
+    1:3:java.lang.Object last():1228 -> last
     1:28:boolean remove(java.lang.Object):1289:1316 -> remove
     1:1:int size():1325:1325 -> size
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1228:1228 -> subSet
@@ -42061,12 +42054,10 @@
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1014:1014 -> <init>
     3:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):995:1016 -> <init>
     1:14:void ensureIndexKnown():1056:1069 -> c
-    1:6:int nextEntry():1084:1089 -> h
-    7:7:int nextEntry():1084:1084 -> h
+    1:7:int nextEntry():1084:1084 -> h
     1:1:boolean hasNext():1048:1048 -> hasNext
     1:1:boolean hasPrevious():1052:1052 -> hasPrevious
-    1:6:int previousEntry():1093:1098 -> i
-    7:7:int previousEntry():1093:1093 -> i
+    1:7:int previousEntry():1093:1093 -> i
     1:2:int nextIndex():1074:1075 -> nextIndex
     1:2:int previousIndex():1079:1080 -> previousIndex
     1:49:void remove():1102:1150 -> remove
@@ -42095,20 +42086,17 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList clone():553:555 -> clone
     1:3:java.lang.Object clone():57 -> clone
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):497:498 -> g
-    1:2:java.lang.Object get(int):317:318 -> get
-    3:3:java.lang.Object get(int):317:317 -> get
-    1:7:void grow(int):285:291 -> h
+    1:3:java.lang.Object get(int):317:317 -> get
+    1:5:void grow(int):287:291 -> h
     1:2:int indexOf(java.lang.Object):323:324 -> indexOf
     1:1:boolean isEmpty():385:385 -> isEmpty
     1:2:int lastIndexOf(java.lang.Object):330:331 -> lastIndexOf
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):497:498 -> listIterator
     1:2:java.util.ListIterator listIterator(int):57 -> listIterator
-    1:5:java.lang.Object remove(int):337:341 -> remove
-    6:6:java.lang.Object remove(int):337:337 -> remove
+    1:6:java.lang.Object remove(int):337:337 -> remove
     7:9:boolean remove(java.lang.Object):348:350 -> remove
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
-    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:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.u.a.a.a.h.b0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
@@ -42119,16 +42107,12 @@
     1:2:void add(java.lang.Object):528:529 -> add
     1:1:boolean hasNext():502:502 -> hasNext
     1:1:boolean hasPrevious():506:506 -> hasPrevious
-    1:2:java.lang.Object next():510:511 -> next
-    3:3:java.lang.Object next():510:510 -> next
+    1:3:java.lang.Object next():510:510 -> next
     1:1:int nextIndex():520:520 -> nextIndex
-    1:2:java.lang.Object previous():515:516 -> previous
-    3:3:java.lang.Object previous():515:515 -> previous
+    1:3:java.lang.Object previous():515:515 -> previous
     1:1:int previousIndex():524:524 -> previousIndex
-    1:9:void remove():538:546 -> remove
-    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
+    1:10:void remove():538:538 -> remove
+    1:3:void set(java.lang.Object):533:533 -> set
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.u.a.a.a.h.e0:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -42154,16 +42138,11 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
-    1:2:java.lang.Object next():129:130 -> next
-    3:3:java.lang.Object next():129:129 -> next
+    1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.u.a.a.a.h.f0:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():88:88 -> <clinit>
-    1:2:java.lang.Object[] grow(java.lang.Object[],int,int):213:214 -> a
-    3:5:java.lang.Object[] newArray(java.lang.Object[],int):106:108 -> a
-    3:5:java.lang.Object[] grow(java.lang.Object[],int,int):215 -> a
-    6:6:java.lang.Object[] grow(java.lang.Object[],int,int):216:216 -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.u.a.a.a.h.g0:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.u.a.a.a.h.h0:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.u.a.a.a.h.i0:
@@ -42243,18 +42222,18 @@
     3:18:boolean put(java.lang.Object,boolean):270 -> a
     19:20:boolean put(java.lang.Object,boolean):272:273 -> a
     21:25:boolean containsValue(boolean):359:363 -> a
-    1:12:boolean removeBoolean(java.lang.Object):308:319 -> b
-    13:19:void rehash(int):916:922 -> b
-    20:20:int realSize():205:205 -> b
-    20:20:void rehash(int):923 -> b
-    21:33:void rehash(int):924:936 -> b
-    1:11:boolean getBoolean(java.lang.Object):326:336 -> c
+    1:7:void rehash(int):916:922 -> b
+    8:8:int realSize():205:205 -> b
+    8:8:void rehash(int):923 -> b
+    9:21:void rehash(int):924:936 -> b
+    1:12:boolean removeBoolean(java.lang.Object):308:319 -> c
     1:4:void clear():376:379 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap clone():954:963 -> clone
     1:10:java.lang.Object clone():49 -> clone
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap clone():956:956 -> clone
     11:11:java.lang.Object clone():49 -> clone
     1:10:boolean containsKey(java.lang.Object):343:352 -> containsKey
+    1:11:boolean getBoolean(java.lang.Object):326:336 -> d
     1:2:boolean removeEntry(int):219:220 -> e
     3:8:void shiftKeys(int):288:293 -> e
     3:8:boolean removeEntry(int):221 -> e
@@ -42348,8 +42327,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):496:519 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):496:496 -> <init>
-    1:18:int nextEntry():531:548 -> c
-    19:19:int nextEntry():531:531 -> c
+    1:19:int nextEntry():531:531 -> c
     1:1:boolean hasNext():527:527 -> hasNext
     1:5:void remove():585:589 -> remove
     6:11:void shiftKeys(int):563:568 -> remove
@@ -42413,15 +42391,13 @@
     int curr -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet):136:137 -> <init>
     1:1:boolean hasNext():141:141 -> hasNext
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry next():147:148 -> next
-    1:2:java.lang.Object next():136 -> next
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry next():147:147 -> next
-    3:3:java.lang.Object next():136 -> next
-    1:6:void remove():153:158 -> remove
-    7:7:void remove():153:153 -> remove
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry next():147:147 -> next
+    1:3:java.lang.Object next():136 -> next
+    1:7:void remove():153:153 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.u.a.a.a.h.D0:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
+    int removeInt(java.lang.Object) -> b
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.u.a.a.a.h.F0:
     float f -> l
     java.lang.Object[] key -> b
@@ -42459,8 +42435,7 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> e
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():87 -> e
     1:25:void fixPointers(int):899:923 -> f
-    1:2:java.lang.Object firstKey():970:971 -> firstKey
-    3:3:java.lang.Object firstKey():970:970 -> firstKey
+    1:3:java.lang.Object firstKey():970:970 -> firstKey
     1:42:void rehash(int):1709:1750 -> g
     1:3:int removeEntry(int):276:278 -> h
     4:9:void shiftKeys(int):410:415 -> h
@@ -42481,8 +42456,7 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():87 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1531:1532 -> keySet
     3:4:java.util.Set keySet():87 -> keySet
-    1:2:java.lang.Object lastKey():981:982 -> lastKey
-    3:3:java.lang.Object lastKey():981:981 -> lastKey
+    1:3:java.lang.Object lastKey():981:981 -> lastKey
     1:1:void putAll(java.util.Map):296:296 -> putAll
     2:3:void ensureCapacity(int):266:267 -> putAll
     2:3:void putAll(java.util.Map):296 -> putAll
@@ -42535,16 +42509,14 @@
     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>
     1:1:void clear():1493:1493 -> clear
     1:1:boolean contains(java.lang.Object):1481:1481 -> contains
-    1:2:java.lang.Object first():1498:1499 -> first
-    3:3:java.lang.Object first():1498:1498 -> first
+    1:3:java.lang.Object first():1498:1498 -> first
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet headSet(java.lang.Object):1520:1520 -> headSet
     1:1:java.util.SortedSet headSet(java.lang.Object):1465 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1471:1471 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1465 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1471:1471 -> iterator
     2:2:java.util.Iterator iterator():1465 -> iterator
-    1:2:java.lang.Object last():1504:1505 -> last
-    3:3:java.lang.Object last():1504:1504 -> last
+    1:3:java.lang.Object last():1504:1504 -> last
     1:3:boolean remove(java.lang.Object):1486:1488 -> remove
     1:1:int size():1476:1476 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet subSet(java.lang.Object,java.lang.Object):1525:1525 -> subSet
@@ -42576,20 +42548,16 @@
     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>
     1:1:void clear():1373:1373 -> clear
     1:16:boolean contains(java.lang.Object):1309:1324 -> contains
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry first():1296:1297 -> first
-    1:2:java.lang.Object first():1269 -> first
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry first():1296:1296 -> first
-    3:3:java.lang.Object first():1269 -> first
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry first():1296:1296 -> first
+    1:3:java.lang.Object first():1269 -> first
     1:1:java.util.SortedSet headSet(java.lang.Object):1269:1269 -> headSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1286:1286 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1269 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1269:1269 -> iterator
     2:2:java.util.Iterator iterator():1269:1269 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1271:1271 -> iterator
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry last():1302:1303 -> last
-    1:2:java.lang.Object last():1269 -> last
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry last():1302:1302 -> last
-    3:3:java.lang.Object last():1269 -> last
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry last():1302:1302 -> last
+    1:3:java.lang.Object last():1269 -> last
     1:29:boolean remove(java.lang.Object):1331:1359 -> remove
     1:1:int size():1368:1368 -> size
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1269:1269 -> subSet
@@ -42608,12 +42576,10 @@
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1057:1057 -> <init>
     3:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1038:1059 -> <init>
     1:14:void ensureIndexKnown():1099:1112 -> c
-    1:6:int nextEntry():1127:1132 -> h
-    7:7:int nextEntry():1127:1127 -> h
+    1:7:int nextEntry():1127:1127 -> h
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
-    1:6:int previousEntry():1136:1141 -> i
-    7:7:int previousEntry():1136:1136 -> i
+    1:7:int previousEntry():1136:1136 -> i
     1:2:int nextIndex():1117:1118 -> nextIndex
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
@@ -42770,8 +42736,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):541:564 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):541:541 -> <init>
-    1:18:int nextEntry():576:593 -> c
-    19:19:int nextEntry():576:576 -> c
+    1:19:int nextEntry():576:576 -> c
     1:1:boolean hasNext():572:572 -> hasNext
     1:5:void remove():630:634 -> remove
     6:11:void shiftKeys(int):608:613 -> remove
@@ -42814,18 +42779,18 @@
     3:18:long put(java.lang.Object,long):270 -> a
     19:20:long put(java.lang.Object,long):272:273 -> a
     21:25:boolean containsValue(long):404:408 -> a
-    1:12:long removeLong(java.lang.Object):353:364 -> b
-    13:19:void rehash(int):961:967 -> b
-    20:20:int realSize():205:205 -> b
-    20:20:void rehash(int):968 -> b
-    21:33:void rehash(int):969:981 -> b
-    1:11:long getLong(java.lang.Object):371:381 -> c
+    1:7:void rehash(int):961:967 -> b
+    8:8:int realSize():205:205 -> b
+    8:8:void rehash(int):968 -> b
+    9:21:void rehash(int):969:981 -> b
+    1:12:long removeLong(java.lang.Object):353:364 -> c
     1:4:void clear():421:424 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap clone():999:1008 -> clone
     1:10:java.lang.Object clone():49 -> clone
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap clone():1001:1001 -> clone
     11:11:java.lang.Object clone():49 -> clone
     1:10:boolean containsKey(java.lang.Object):388:397 -> containsKey
+    1:11:long getLong(java.lang.Object):371:381 -> d
     1:2:long removeEntry(int):219:220 -> e
     3:8:void shiftKeys(int):333:338 -> e
     3:8:long removeEntry(int):221 -> e
@@ -42919,8 +42884,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> f
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):541:564 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):541:541 -> <init>
-    1:18:int nextEntry():576:593 -> c
-    19:19:int nextEntry():576:576 -> c
+    1:19:int nextEntry():576:576 -> c
     1:1:boolean hasNext():572:572 -> hasNext
     1:5:void remove():630:634 -> remove
     6:11:void shiftKeys(int):608:613 -> remove
@@ -42951,20 +42915,17 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList clone():553:555 -> clone
     1:3:java.lang.Object clone():57 -> clone
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):497:498 -> g
-    1:2:java.lang.Object get(int):317:318 -> get
-    3:3:java.lang.Object get(int):317:317 -> get
-    1:7:void grow(int):285:291 -> h
+    1:3:java.lang.Object get(int):317:317 -> get
+    1:5:void grow(int):287:291 -> h
     1:2:int indexOf(java.lang.Object):323:324 -> indexOf
     1:1:boolean isEmpty():385:385 -> isEmpty
     1:2:int lastIndexOf(java.lang.Object):330:331 -> lastIndexOf
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):497:498 -> listIterator
     1:2:java.util.ListIterator listIterator(int):57 -> listIterator
-    1:5:java.lang.Object remove(int):337:341 -> remove
-    6:6:java.lang.Object remove(int):337:337 -> remove
+    1:6:java.lang.Object remove(int):337:337 -> remove
     7:9:boolean remove(java.lang.Object):348:350 -> remove
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
-    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:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.u.a.a.a.h.Q0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
@@ -42975,16 +42936,12 @@
     1:2:void add(java.lang.Object):528:529 -> add
     1:1:boolean hasNext():502:502 -> hasNext
     1:1:boolean hasPrevious():506:506 -> hasPrevious
-    1:2:java.lang.Object next():510:511 -> next
-    3:3:java.lang.Object next():510:510 -> next
+    1:3:java.lang.Object next():510:510 -> next
     1:1:int nextIndex():520:520 -> nextIndex
-    1:2:java.lang.Object previous():515:516 -> previous
-    3:3:java.lang.Object previous():515:515 -> previous
+    1:3:java.lang.Object previous():515:515 -> previous
     1:1:int previousIndex():524:524 -> previousIndex
-    1:9:void remove():538:546 -> remove
-    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
+    1:10:void remove():538:538 -> remove
+    1:3:void set(java.lang.Object):533:533 -> set
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.u.a.a.a.h.T0:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -43010,8 +42967,7 @@
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
-    1:2:java.lang.Object next():129:130 -> next
-    3:3:java.lang.Object next():129:129 -> next
+    1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.u.a.a.a.h.U0:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.u.a.a.a.h.X0:
@@ -43111,8 +43067,7 @@
     1:21:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet):414:434 -> <init>
     22:22:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1):414:414 -> <init>
     1:1:boolean hasNext():442:442 -> hasNext
-    1:15:java.lang.Object next():446:460 -> next
-    16:16:java.lang.Object next():446:446 -> next
+    1:16:java.lang.Object next():446:446 -> next
     1:5:void remove():496:500 -> remove
     6:11:void shiftKeys(int):475:480 -> remove
     6:11:void remove():500 -> remove
@@ -43166,7 +43121,7 @@
     99:103:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):197 -> a
     104:104:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):198:198 -> a
     105:108:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):202:205 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> a
     109:109:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):206 -> a
     110:110:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):206:206 -> a
     111:118:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):205:212 -> a
@@ -43199,7 +43154,7 @@
     260:260:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):421:421 -> a
     261:261:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):419:419 -> a
     1:9:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):108:116 -> b
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> b
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> b
     10:10:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117 -> b
     11:15:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:121 -> b
     16:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:130 -> b
@@ -43264,8 +43219,7 @@
     java.lang.Object lock -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object):55:59 -> <init>
     1:14:java.lang.Object getValue():63:76 -> getValue
-    15:20:java.lang.Object getValue():69:74 -> getValue
-    21:21:java.lang.Object getValue():69:69 -> getValue
+    15:21:java.lang.Object getValue():69:69 -> getValue
     1:1:boolean isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
     2:2:java.lang.String toString():84:84 -> toString
@@ -43338,8 +43292,7 @@
     1:1:boolean hasNext():74:74 -> hasNext
     2:2:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():13:13 -> hasNext
     2:2:boolean hasNext():74 -> hasNext
-    1:2:java.lang.Object next():77:78 -> next
-    3:3:java.lang.Object next():77:77 -> next
+    1:3:java.lang.Object next():77:77 -> next
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$ListIteratorImpl -> com.android.tools.r8.w.a.q.d$b:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList this$0 -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int):85:89 -> <init>
@@ -43347,8 +43300,7 @@
     6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int):88 -> <init>
     1:1:boolean hasPrevious():92:92 -> hasPrevious
     1:1:int nextIndex():94:94 -> nextIndex
-    1:2:java.lang.Object previous():97:98 -> previous
-    3:3:java.lang.Object previous():97:97 -> previous
+    1:3:java.lang.Object previous():97:97 -> previous
     1:1:int previousIndex():101:101 -> previousIndex
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$SubList -> com.android.tools.r8.w.a.q.e:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList list -> c
@@ -43620,8 +43572,8 @@
     5:88:java.lang.Object[] toArray(java.util.Collection):21:104 -> a
     89:89:java.lang.Object[] toArray(java.util.Collection):23:23 -> a
     90:90:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):106:106 -> a
-    91:166:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):34:109 -> a
-    167:260:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):34:127 -> a
+    91:167:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):34:34 -> a
+    172:260:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):39:127 -> a
     261:264:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):43:46 -> a
     265:265:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):39:39 -> a
     266:266:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):30:30 -> a
@@ -43744,12 +43696,9 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KClass com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.getOrCreateKotlinClass(java.lang.Class):27:27 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):50 -> a
     3:3:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):69:69 -> a
-    4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionBase):41:42 -> a
-    4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):36 -> a
-    4:5:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):69 -> a
-    6:6:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionBase):41:41 -> a
-    6:6:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):36 -> a
-    6:6:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):69 -> a
+    4:6:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionBase):41:41 -> a
+    4:6:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):36 -> a
+    4:6:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):69 -> a
     7:7:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94:94 -> a
     8:8:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):0:0 -> a
     8:8:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94 -> a
@@ -43992,6 +43941,7 @@
 com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.w.b.a.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_OPEN -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_ABSTRACT -> i
+    com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_SEALED -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_PRIVATE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_PROTECTED -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_PUBLIC -> f
@@ -44015,8 +43965,6 @@
     151:192:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
     151:192:void <clinit>():102 -> <clinit>
     193:211:void <clinit>():109:127 -> <clinit>
-    212:253:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    212:253:void <clinit>():127 -> <clinit>
     1:1:void <init>(int,int,int):40:40 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):41:41 -> <init>
     1:1:boolean invoke(int):52:52 -> a
@@ -44043,10 +43991,8 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation value -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):51:51 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation getValue():51:51 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation getValue():51:51 -> equals
-    1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation getValue():51:51 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation getValue():51:51 -> equals
+    1:2:boolean equals(java.lang.Object):0 -> equals
     3:3:boolean equals(java.lang.Object):0:0 -> equals
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation getValue():51:51 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -44058,10 +44004,8 @@
     java.util.List value -> a
     1:1:void <init>(java.util.List):52:52 -> <init>
     1:1:java.util.List getValue():52:52 -> a
-    1:1:java.util.List getValue():52:52 -> equals
-    1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.util.List getValue():52:52 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
+    1:2:java.util.List getValue():52:52 -> equals
+    1:2:boolean equals(java.lang.Object):0 -> equals
     3:3:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.util.List getValue():52:52 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -44175,10 +44119,8 @@
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     1:1:java.lang.String getValue():46:46 -> a
-    1:1:java.lang.String getValue():46:46 -> equals
-    1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.String getValue():46:46 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
+    1:2:java.lang.String getValue():46:46 -> equals
+    1:2:boolean equals(java.lang.Object):0 -> equals
     3:3:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.String getValue():46:46 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -44222,10 +44164,8 @@
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):45:45 -> <init>
     1:1:java.lang.String getValue():45:45 -> a
-    1:1:java.lang.String getValue():45:45 -> equals
-    1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.String getValue():45:45 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
+    1:2:java.lang.String getValue():45:45 -> equals
+    1:2:boolean equals(java.lang.Object):0 -> equals
     3:3:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.String getValue():45:45 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -44367,7 +44307,9 @@
     1:1:void visitSealedSubclass(java.lang.String):140:140 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():144:144 -> e
     1:1:java.util.List getConstructors():74:74 -> f
-    1:1:java.util.List getSupertypes():54:54 -> g
+    1:1:int getFlags():39:39 -> g
+    1:1:java.util.List getSealedSubclasses():94:94 -> h
+    1:1:java.util.List getSupertypes():54:54 -> i
 com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.w.b.a.y:
 com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.w.b.a.z:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):57:57 -> <init>
@@ -44413,10 +44355,9 @@
     737:1461:void <init>(int):260:984 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):263:263 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):269:269 -> a
-    3:701:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):277:975 -> a
-    702:1402:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):277:977 -> a
-    1403:2104:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):278:979 -> a
-    2105:2105:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):279:279 -> a
+    3:702:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):277:277 -> a
+    703:1403:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):278:278 -> a
+    1404:2105:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):279:279 -> a
     2106:2106:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor.getType():240:240 -> a
     2106:2106:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):279 -> a
     2107:2107:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):279:279 -> a
@@ -44439,8 +44380,8 @@
     java.util.List effects -> b
     1:5:void <init>():758:762 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):765:765 -> a
-    2:204:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:975 -> a
-    205:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:774 -> a
+    2:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:773 -> a
+    206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):774:774 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.w.b.a.J:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):663:663 -> <init>
@@ -44464,8 +44405,8 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> e
     1:6:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):791:796 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():807:807 -> a
-    2:162:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):815:975 -> a
-    163:165:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):815:817 -> a
+    2:163:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):815:815 -> a
+    164:165:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):816:817 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():804:804 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():790:790 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():789:789 -> e
@@ -44553,8 +44494,8 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):334:334 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():343:343 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):346:346 -> a
-    7:628:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):354:975 -> a
-    629:1252:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):354:977 -> a
+    7:629:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):354:354 -> a
+    630:1252:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):355:977 -> a
     1253:1876:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):356:979 -> a
     1877:2500:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):358:981 -> a
     2501:2501:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360:360 -> a
@@ -44646,25 +44587,30 @@
     java.util.List extensions -> g
     1:604:void <init>(int,java.lang.String,int,int):380:983 -> <init>
     605:1182:void <init>(int,java.lang.String,int,int):407:984 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):410:410 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):413:413 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):416:416 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):425:425 -> a
-    5:547:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):433:975 -> a
-    548:1092:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):433:977 -> a
-    1093:1635:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):437:979 -> a
-    1636:1636:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):438:438 -> a
-    1637:1637:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor.getType():165:165 -> a
-    1637:1637:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):438 -> a
+    1:1:void setName(java.lang.String):377:377 -> a
+    2:2:void setReceiverParameterType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):389:389 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):410:410 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):413:413 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):416:416 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):425:425 -> a
+    7:550:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):433:433 -> a
+    551:1094:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):434:977 -> a
+    1095:1637:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):437:979 -> a
     1638:1638:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):438:438 -> a
     1639:1639:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor.getType():165:165 -> a
     1639:1639:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):438 -> a
-    1640:1640:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):439:439 -> a
-    1641:1641:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):436:436 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):419:419 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():422:422 -> b
+    1640:1640:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):438:438 -> a
+    1641:1641:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor.getType():165:165 -> a
+    1641:1641:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):438 -> a
+    1642:1642:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):439:439 -> a
+    1643:1643:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):436:436 -> a
+    1:1:void setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):399:399 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):419:419 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():422:422 -> b
     1:1:int getFlags():376:376 -> c
+    2:2:void setGetterFlags(int):378:378 -> c
     1:1:int getGetterFlags():378:378 -> d
+    2:2:void setSetterFlags(int):379:379 -> d
     1:1:java.lang.String getName():377:377 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReceiverParameterType():389:389 -> f
     1:1:int getSetterFlags():379:379 -> g
@@ -44727,8 +44673,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):480:480 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitExpandedType(int):486:486 -> a
     3:3:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):489:489 -> a
-    4:478:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):501:975 -> a
-    479:955:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):501:977 -> a
+    4:479:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):501:501 -> a
+    480:955:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):502:977 -> a
     956:1431:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):504:979 -> a
     1432:1433:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):505:506 -> a
     1434:1434:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):503:503 -> a
@@ -44759,9 +44705,8 @@
     421:834:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):569:982 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):572:572 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):575:575 -> a
-    3:395:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):583:975 -> a
-    396:790:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):583:977 -> a
-    791:791:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):584:584 -> a
+    3:396:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):583:583 -> a
+    397:791:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):584:584 -> a
     792:792:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor.getType():271:271 -> a
     792:792:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):584 -> a
     793:793:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):584:584 -> a
@@ -44792,16 +44737,16 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):511:511 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):511:511 -> <init>
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int) -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
     void visitClass(java.lang.String) -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String) -> a
-    1:1:void visitEnd():610:610 -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int) -> b
-    void visitStarProjection() -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):548:548 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):570:570 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):596:596 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):604:604 -> a
+    5:5:void visitEnd():610:610 -> a
     void visitTypeAlias(java.lang.String) -> b
-    void visitTypeParameter(int) -> c
+    1:1:void visitStarProjection():555:555 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):585:585 -> b
+    1:1:void visitTypeParameter(int):537:537 -> c
 com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.w.b.a.o0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType varargElementType -> c
@@ -44892,8 +44837,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):241:241 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):423 -> b
-    5:6:void visitEnumEntry(java.lang.String):434:435 -> b
-    7:7:void visitEnumEntry(java.lang.String):434:434 -> b
+    5:7:void visitEnumEntry(java.lang.String):434:434 -> b
     1:4:void visit(int,java.lang.String):401:404 -> c
     5:5:void visitNestedClass(java.lang.String):430:430 -> c
     1:1:void visitSealedSubclass(java.lang.String):440:440 -> d
@@ -45033,8 +44977,7 @@
     81:103:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):29:51 -> a
     104:135:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:81 -> a
     136:136:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):80:80 -> a
-    137:167:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:80 -> a
-    168:168:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:50 -> a
+    137:168:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:50 -> a
     169:169:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):49:49 -> a
     170:170:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):48:48 -> a
     171:171:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):47:47 -> a
@@ -45047,8 +44990,7 @@
     178:178:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):40:40 -> a
     179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):39:39 -> a
     180:180:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):38:38 -> a
-    181:255:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):28:102 -> a
-    256:256:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):28:28 -> a
+    181:256:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):28:28 -> a
     257:257:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
     258:258:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
     258:258:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41 -> a
@@ -45257,12 +45199,9 @@
     3985:3985:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
     3986:3991:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264:269 -> a
     3986:3991:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3992:4087:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:95 -> a
-    3992:4087:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):269 -> a
-    3992:4087:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    4088:4088:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:0 -> a
-    4088:4088:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):269 -> a
-    4088:4088:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    3992:4088:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:0 -> a
+    3992:4088:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):269 -> a
+    3992:4088:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
     4089:4089:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):272:272 -> a
     4089:4089:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
     4090:4108:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):277:295 -> a
@@ -45295,10 +45234,8 @@
     4395:4396:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):317 -> a
     4397:4397:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):318:318 -> a
     4398:4405:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):316:323 -> a
-    4406:4510:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:104 -> a
-    4406:4510:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):323 -> a
-    4511:4511:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:0 -> a
-    4511:4511:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):323 -> a
+    4406:4511:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:0 -> a
+    4406:4511:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):323 -> a
     4512:4512:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):326:326 -> a
     4513:4517:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):282:286 -> a
     4518:4518:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
@@ -45307,15 +45244,15 @@
     4520:4520:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330:330 -> a
     4521:4623:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):0:102 -> a
     4521:4623:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4624:4627:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):65:68 -> a
-    4624:4627:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    4624:4627:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4628:4636:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):65:73 -> a
-    4628:4636:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    4628:4636:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4637:4642:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):70:75 -> a
-    4637:4642:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    4637:4642:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4624:4628:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):65:65 -> a
+    4624:4628:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
+    4624:4628:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4633:4637:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):70:70 -> a
+    4633:4637:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
+    4633:4637:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4642:4642:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):75:75 -> a
+    4642:4642:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
+    4642:4642:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
     4643:4646:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):105:108 -> a
     4643:4646:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
     4647:4647:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):107:107 -> a
@@ -45658,8 +45595,7 @@
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):105:105 -> a
     10:17:void visitEnd():110:117 -> a
     1:1:void visitTypeAlias(java.lang.String):65:65 -> b
-    2:3:void visitStarProjection():69:70 -> b
-    4:4:void visitStarProjection():69:69 -> b
+    2:4:void visitStarProjection():69:69 -> b
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):94:94 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
@@ -45883,8 +45819,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):1875:1875 -> <init>
     3:2367:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):1881:4245 -> <init>
     2368:2368:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):1882:1882 -> <init>
-    2369:4730:void <init>(boolean):1884:4245 -> <init>
-    4731:4731:void <init>(boolean):1884:1884 -> <init>
+    2369:4731:void <init>(boolean):1884:1884 -> <init>
     4732:7078:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1899:4245 -> <init>
     7079:7111:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1900:1932 -> <init>
     7112:7129:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1923:1940 -> <init>
@@ -45949,8 +45884,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):1996:1996 -> <init>
     3:1861:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2002:3860 -> <init>
     1862:1862:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2003:2003 -> <init>
-    1863:3718:void <init>(boolean):2005:3860 -> <init>
-    3719:3719:void <init>(boolean):2005:2005 -> <init>
+    1863:3719:void <init>(boolean):2005:2005 -> <init>
     3720:5560:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2020:3860 -> <init>
     5561:5598:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2021:2058 -> <init>
     5599:5621:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2044:2066 -> <init>
@@ -46072,8 +46006,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):2257:2257 -> <init>
     3:620:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2263:2880 -> <init>
     621:621:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2264:2264 -> <init>
-    622:1236:void <init>(boolean):2266:2880 -> <init>
-    1237:1237:void <init>(boolean):2266:2266 -> <init>
+    622:1237:void <init>(boolean):2266:2266 -> <init>
     1238:1837:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2281:2880 -> <init>
     1838:1930:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2282:2374 -> <init>
     1931:1932:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2368:2369 -> <init>
@@ -46371,8 +46304,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):8497:8497 -> <init>
     3:1002:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):8504:9503 -> <init>
     1003:1003:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):8505:8505 -> <init>
-    1004:2000:void <init>(boolean):8507:9503 -> <init>
-    2001:2001:void <init>(boolean):8507:8507 -> <init>
+    1004:2001:void <init>(boolean):8507:8507 -> <init>
     2002:2983:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8522:9503 -> <init>
     2984:3184:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8523:8723 -> <init>
     3185:3194:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8701:8710 -> <init>
@@ -46726,8 +46658,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):13367:13367 -> <init>
     3:258:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):13374:13629 -> <init>
     259:259:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):13375:13375 -> <init>
-    260:512:void <init>(boolean):13377:13629 -> <init>
-    513:513:void <init>(boolean):13377:13377 -> <init>
+    260:513:void <init>(boolean):13377:13377 -> <init>
     514:751:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13392:13629 -> <init>
     752:805:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13393:13446 -> <init>
     806:809:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13430:13433 -> <init>
@@ -46834,8 +46765,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23312:23312 -> <init>
     3:151:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23318:23466 -> <init>
     152:152:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23319:23319 -> <init>
-    153:298:void <init>(boolean):23321:23466 -> <init>
-    299:299:void <init>(boolean):23321:23321 -> <init>
+    153:299:void <init>(boolean):23321:23321 -> <init>
     300:430:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23336:23466 -> <init>
     431:466:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23337:23372 -> <init>
     467:482:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23370:23385 -> <init>
@@ -46938,8 +46868,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23842:23842 -> <init>
     3:426:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23848:24271 -> <init>
     427:427:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23849:23849 -> <init>
-    428:848:void <init>(boolean):23851:24271 -> <init>
-    849:849:void <init>(boolean):23851:23851 -> <init>
+    428:849:void <init>(boolean):23851:23851 -> <init>
     850:1255:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23866:24271 -> <init>
     1256:1319:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23867:23930 -> <init>
     1320:1328:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23911:23919 -> <init>
@@ -47093,8 +47022,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20457:20457 -> <init>
     3:128:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):20464:20589 -> <init>
     129:129:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):20465:20465 -> <init>
-    130:252:void <init>(boolean):20467:20589 -> <init>
-    253:253:void <init>(boolean):20467:20467 -> <init>
+    130:253:void <init>(boolean):20467:20467 -> <init>
     254:361:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20482:20589 -> <init>
     362:394:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20483:20515 -> <init>
     395:407:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20513:20525 -> <init>
@@ -47179,8 +47107,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):24947:24947 -> <init>
     3:504:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):24953:25454 -> <init>
     505:505:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):24954:24954 -> <init>
-    506:1004:void <init>(boolean):24956:25454 -> <init>
-    1005:1005:void <init>(boolean):24956:24956 -> <init>
+    506:1005:void <init>(boolean):24956:24956 -> <init>
     1006:1489:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24971:25454 -> <init>
     1490:1565:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24972:25047 -> <init>
     1566:1569:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25036:25039 -> <init>
@@ -47369,8 +47296,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):14313:14313 -> <init>
     3:582:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):14320:14899 -> <init>
     583:583:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):14321:14321 -> <init>
-    584:1160:void <init>(boolean):14323:14899 -> <init>
-    1161:1161:void <init>(boolean):14323:14323 -> <init>
+    584:1161:void <init>(boolean):14323:14323 -> <init>
     1162:1723:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14338:14899 -> <init>
     1724:1857:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14339:14472 -> <init>
     1858:1867:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14450:14459 -> <init>
@@ -47662,8 +47588,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):11558:11558 -> <init>
     3:342:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):11565:11904 -> <init>
     343:343:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):11566:11566 -> <init>
-    344:680:void <init>(boolean):11568:11904 -> <init>
-    681:681:void <init>(boolean):11568:11568 -> <init>
+    344:681:void <init>(boolean):11568:11568 -> <init>
     682:1003:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11583:11904 -> <init>
     1004:1073:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11584:11653 -> <init>
     1074:1082:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11632:11640 -> <init>
@@ -47837,8 +47762,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):16290:16290 -> <init>
     3:564:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):16297:16858 -> <init>
     565:565:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):16298:16298 -> <init>
-    566:1124:void <init>(boolean):16300:16858 -> <init>
-    1125:1125:void <init>(boolean):16300:16300 -> <init>
+    566:1125:void <init>(boolean):16300:16300 -> <init>
     1126:1669:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16315:16858 -> <init>
     1670:1792:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16316:16438 -> <init>
     1793:1796:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16422:16425 -> <init>
@@ -48089,8 +48013,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):4805:4805 -> <init>
     3:1246:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):4812:6055 -> <init>
     1247:1247:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):4813:4813 -> <init>
-    1248:2488:void <init>(boolean):4815:6055 -> <init>
-    2489:2489:void <init>(boolean):4815:4815 -> <init>
+    1248:2489:void <init>(boolean):4815:4815 -> <init>
     2490:3715:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4830:6055 -> <init>
     3716:3832:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4831:4947 -> <init>
     3833:3841:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4934:4942 -> <init>
@@ -48216,8 +48139,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):5028:5028 -> <init>
     3:271:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):5034:5302 -> <init>
     272:272:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):5035:5035 -> <init>
-    273:538:void <init>(boolean):5037:5302 -> <init>
-    539:539:void <init>(boolean):5037:5037 -> <init>
+    273:539:void <init>(boolean):5037:5037 -> <init>
     540:790:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5052:5302 -> <init>
     791:840:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5053:5102 -> <init>
     841:849:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5089:5097 -> <init>
@@ -48492,8 +48414,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):19013:19013 -> <init>
     3:464:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):19020:19481 -> <init>
     465:465:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):19021:19021 -> <init>
-    466:924:void <init>(boolean):19023:19481 -> <init>
-    925:925:void <init>(boolean):19023:19023 -> <init>
+    466:925:void <init>(boolean):19023:19023 -> <init>
     926:1369:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19038:19481 -> <init>
     1370:1472:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19039:19141 -> <init>
     1473:1476:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19125:19128 -> <init>
@@ -48702,8 +48623,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):7250:7250 -> <init>
     3:391:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):7257:7645 -> <init>
     392:392:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):7258:7258 -> <init>
-    393:778:void <init>(boolean):7260:7645 -> <init>
-    779:779:void <init>(boolean):7260:7260 -> <init>
+    393:779:void <init>(boolean):7260:7260 -> <init>
     780:1150:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7275:7645 -> <init>
     1151:1226:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7276:7351 -> <init>
     1227:1230:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7335:7338 -> <init>
@@ -48859,16 +48779,13 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable defaultInstance -> g
     byte memoizedIsInitialized -> e
     1:487:void <clinit>():12806:13292 -> <clinit>
-    488:489:void initFields():12883:12884 -> <clinit>
-    488:489:void <clinit>():13293 -> <clinit>
-    490:490:void initFields():12883:12883 -> <clinit>
-    490:490:void <clinit>():13293 -> <clinit>
+    488:490:void initFields():12883:12883 -> <clinit>
+    488:490:void <clinit>():13293 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):12725:12725 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):12725:12725 -> <init>
     3:186:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):12731:12914 -> <init>
     187:187:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):12732:12732 -> <init>
-    188:368:void <init>(boolean):12734:12914 -> <init>
-    369:369:void <init>(boolean):12734:12734 -> <init>
+    188:369:void <init>(boolean):12734:12734 -> <init>
     370:535:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12749:12914 -> <init>
     536:568:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12750:12782 -> <init>
     569:585:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12774:12790 -> <init>
@@ -48972,8 +48889,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):18047:18047 -> <init>
     3:294:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):18054:18345 -> <init>
     295:295:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):18055:18055 -> <init>
-    296:584:void <init>(boolean):18057:18345 -> <init>
-    585:585:void <init>(boolean):18057:18057 -> <init>
+    296:585:void <init>(boolean):18057:18057 -> <init>
     586:859:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18072:18345 -> <init>
     860:925:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18073:18138 -> <init>
     926:927:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18132:18133 -> <init>
@@ -49141,8 +49057,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20924:20924 -> <init>
     3:440:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):20930:21367 -> <init>
     441:441:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):20931:20931 -> <init>
-    442:876:void <init>(boolean):20933:21367 -> <init>
-    877:877:void <init>(boolean):20933:20933 -> <init>
+    442:877:void <init>(boolean):20933:20933 -> <init>
     878:1297:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20948:21367 -> <init>
     1298:1360:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20949:21011 -> <init>
     1361:1362:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20999:21000 -> <init>
@@ -49297,8 +49212,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):21944:21944 -> <init>
     3:145:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):21950:22092 -> <init>
     146:146:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):21951:21951 -> <init>
-    147:286:void <init>(boolean):21953:22092 -> <init>
-    287:287:void <init>(boolean):21953:21953 -> <init>
+    147:287:void <init>(boolean):21953:21953 -> <init>
     288:412:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21968:22092 -> <init>
     413:448:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21969:22004 -> <init>
     449:464:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22002:22017 -> <init>
@@ -49545,8 +49459,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getEMPTY():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> a
-    3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:19 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
+    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.w.b.a.x0.a.x0.r:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension constructorSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension propertySignature -> d
@@ -49579,8 +49492,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2594:2594 -> <init>
     3:152:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2600:2749 -> <init>
     153:153:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2601:2601 -> <init>
-    154:300:void <init>(boolean):2603:2749 -> <init>
-    301:301:void <init>(boolean):2603:2603 -> <init>
+    154:301:void <init>(boolean):2603:2603 -> <init>
     302:433:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2618:2749 -> <init>
     434:463:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2619:2648 -> <init>
     464:478:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2642:2656 -> <init>
@@ -49676,8 +49588,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2132:2132 -> <init>
     3:152:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2138:2287 -> <init>
     153:153:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2139:2139 -> <init>
-    154:300:void <init>(boolean):2141:2287 -> <init>
-    301:301:void <init>(boolean):2141:2141 -> <init>
+    154:301:void <init>(boolean):2141:2141 -> <init>
     302:433:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2156:2287 -> <init>
     434:463:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2157:2186 -> <init>
     464:478:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2180:2194 -> <init>
@@ -49769,16 +49680,13 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> j
     byte memoizedIsInitialized -> g
     1:596:void <clinit>():3191:3786 -> <clinit>
-    597:600:void initFields():3276:3279 -> <clinit>
-    597:600:void <clinit>():3787 -> <clinit>
-    601:601:void initFields():3276:3276 -> <clinit>
-    601:601:void <clinit>():3787 -> <clinit>
+    597:601:void initFields():3276:3276 -> <clinit>
+    597:601:void <clinit>():3787 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):3074:3074 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):3074:3074 -> <init>
     3:232:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):3080:3309 -> <init>
     233:233:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):3081:3081 -> <init>
-    234:460:void <init>(boolean):3083:3309 -> <init>
-    461:461:void <init>(boolean):3083:3083 -> <init>
+    234:461:void <init>(boolean):3083:3083 -> <init>
     462:673:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3098:3309 -> <init>
     674:745:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3099:3170 -> <init>
     746:754:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3149:3157 -> <init>
@@ -49917,16 +49825,13 @@
     int localNameMemoizedSerializedSize -> d
     byte memoizedIsInitialized -> e
     1:1923:void <clinit>():170:2092 -> <clinit>
-    1924:1925:void initFields():1633:1634 -> <clinit>
-    1924:1925:void <clinit>():2093 -> <clinit>
-    1926:1926:void initFields():1633:1633 -> <clinit>
-    1926:1926:void <clinit>():2093 -> <clinit>
+    1924:1926:void initFields():1633:1633 -> <clinit>
+    1924:1926:void <clinit>():2093 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):70:70 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):70:70 -> <init>
     3:1589:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):76:1662 -> <init>
     1590:1590:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):77:77 -> <init>
-    1591:3174:void <init>(boolean):79:1662 -> <init>
-    3175:3175:void <init>(boolean):79:79 -> <init>
+    1591:3175:void <init>(boolean):79:79 -> <init>
     3176:4744:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):94:1662 -> <init>
     4745:4793:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):95:143 -> <init>
     4794:4797:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):127:130 -> <init>
@@ -50023,8 +49928,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):328:328 -> <init>
     3:491:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):334:822 -> <init>
     492:492:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):335:335 -> <init>
-    493:978:void <init>(boolean):337:822 -> <init>
-    979:979:void <init>(boolean):337:337 -> <init>
+    493:979:void <init>(boolean):337:337 -> <init>
     980:1450:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):352:822 -> <init>
     1451:1540:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):353:442 -> <init>
     1541:1550:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):427:436 -> <init>
@@ -50268,15 +50172,11 @@
     5:5:java.lang.String asString():24:24 -> a
     1:1:java.lang.String getDesc():23:23 -> b
     1:1:java.lang.String getName():23:23 -> c
-    1:1:java.lang.String getName():23:23 -> equals
-    1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.String getName():23:23 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
+    1:2:java.lang.String getName():23:23 -> equals
+    1:2:boolean equals(java.lang.Object):0 -> equals
     3:3:boolean equals(java.lang.Object):0:0 -> equals
-    4:4:java.lang.String getDesc():23:23 -> equals
-    4:4:boolean equals(java.lang.Object):0 -> equals
-    5:5:java.lang.String getDesc():23:23 -> equals
-    5:5:boolean equals(java.lang.Object):0 -> equals
+    4:5:java.lang.String getDesc():23:23 -> equals
+    4:5:boolean equals(java.lang.Object):0 -> equals
     6:6:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.String getName():23:23 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -50297,15 +50197,11 @@
     5:5:java.lang.String asString():20:20 -> a
     1:1:java.lang.String getDesc():19:19 -> b
     1:1:java.lang.String getName():19:19 -> c
-    1:1:java.lang.String getName():19:19 -> equals
-    1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.String getName():19:19 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
+    1:2:java.lang.String getName():19:19 -> equals
+    1:2:boolean equals(java.lang.Object):0 -> equals
     3:3:boolean equals(java.lang.Object):0:0 -> equals
-    4:4:java.lang.String getDesc():19:19 -> equals
-    4:4:boolean equals(java.lang.Object):0 -> equals
-    5:5:java.lang.String getDesc():19:19 -> equals
-    5:5:boolean equals(java.lang.Object):0 -> equals
+    4:5:java.lang.String getDesc():19:19 -> equals
+    4:5:boolean equals(java.lang.Object):0 -> equals
     6:6:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.String getName():19:19 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -50332,9 +50228,9 @@
     java.util.Set localNameIndices -> a
     java.util.Map PREDEFINED_STRINGS_MAP -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion Companion -> g
-    1:31:void <clinit>():78:108 -> <clinit>
-    32:74:void <clinit>():78:120 -> <clinit>
-    75:86:void <clinit>():111:122 -> <clinit>
+    1:32:void <clinit>():78:78 -> <clinit>
+    65:75:void <clinit>():111:111 -> <clinit>
+    86:86:void <clinit>():122:122 -> <clinit>
     1:16:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):13:28 -> <init>
     17:17:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):20:20 -> <init>
     1:1:java.util.Map access$getPREDEFINED_STRINGS_MAP$cp():13:13 -> a
@@ -50383,8 +50279,7 @@
     179:179:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.listOfNotNull(java.lang.Object):118 -> a
     179:179:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.listOfNotNull(java.lang.Object):0 -> a
     179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75 -> a
-    180:241:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75:136 -> a
-    242:242:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75:75 -> a
+    180:242:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75:75 -> a
     243:2317:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.plus(java.util.Collection,java.lang.Iterable):0:2074 -> a
     243:2317:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.plus(java.util.Collection,java.lang.Iterable):0 -> a
     243:2317:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75 -> a
@@ -51753,15 +51648,11 @@
     5:5:java.lang.String asString():52:52 -> a
     1:1:java.lang.String getDesc():51:51 -> b
     1:1:java.lang.String getName():51:51 -> c
-    1:1:java.lang.String getName():51:51 -> equals
-    1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.String getName():51:51 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
+    1:2:java.lang.String getName():51:51 -> equals
+    1:2:boolean equals(java.lang.Object):0 -> equals
     3:3:boolean equals(java.lang.Object):0:0 -> equals
-    4:4:java.lang.String getDesc():51:51 -> equals
-    4:4:boolean equals(java.lang.Object):0 -> equals
-    5:5:java.lang.String getDesc():51:51 -> equals
-    5:5:boolean equals(java.lang.Object):0 -> equals
+    4:5:java.lang.String getDesc():51:51 -> equals
+    4:5:boolean equals(java.lang.Object):0 -> equals
     6:6:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.String getName():51:51 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -51799,15 +51690,11 @@
     5:5:java.lang.String asString():41:41 -> a
     1:1:java.lang.String getDesc():40:40 -> b
     1:1:java.lang.String getName():40:40 -> c
-    1:1:java.lang.String getName():40:40 -> equals
-    1:1:boolean equals(java.lang.Object):0 -> equals
-    2:2:java.lang.String getName():40:40 -> equals
-    2:2:boolean equals(java.lang.Object):0 -> equals
+    1:2:java.lang.String getName():40:40 -> equals
+    1:2:boolean equals(java.lang.Object):0 -> equals
     3:3:boolean equals(java.lang.Object):0:0 -> equals
-    4:4:java.lang.String getDesc():40:40 -> equals
-    4:4:boolean equals(java.lang.Object):0 -> equals
-    5:5:java.lang.String getDesc():40:40 -> equals
-    5:5:boolean equals(java.lang.Object):0 -> equals
+    4:5:java.lang.String getDesc():40:40 -> equals
+    4:5:boolean equals(java.lang.Object):0 -> equals
     6:6:boolean equals(java.lang.Object):0:0 -> equals
     1:1:java.lang.String getName():40:40 -> hashCode
     1:1:int hashCode():0 -> hashCode
@@ -52180,8 +52067,11 @@
     2:131:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):102 -> a
     132:132:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor):126:126 -> a
     132:132:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):102 -> a
-    133:136:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):115:118 -> a
-    137:137:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):122:122 -> a
+    133:133:void setFieldSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature):104:104 -> a
+    134:137:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):115:118 -> a
+    138:138:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):122:122 -> a
+    1:1:void setGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):105:105 -> b
+    1:1:void setSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):106:106 -> c
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.w.b.a.y0.B.p:
     java.util.List annotations -> d
     boolean isRaw -> c
@@ -52271,10 +52161,8 @@
     boolean acceptsArguments() -> d
     1:1:java.util.List defaultValues():313:313 -> e
     1:4:boolean equals(java.lang.Object):318:321 -> equals
-    5:5:boolean requiresArgument():301:301 -> equals
-    5:5:boolean equals(java.lang.Object):322 -> equals
-    6:6:boolean requiresArgument():301:301 -> equals
-    6:6:boolean equals(java.lang.Object):322 -> equals
+    5:6:boolean requiresArgument():301:301 -> equals
+    5:6:boolean equals(java.lang.Object):322 -> equals
     boolean isRequired() -> f
     1:1:java.lang.String argumentTypeIndicator():309:309 -> g
     2:3:java.lang.String com.android.tools.r8.joptsimple.AbstractOptionSpec.argumentTypeIndicatorFrom(com.android.tools.r8.joptsimple.ValueConverter):105:106 -> g
@@ -52811,14 +52699,14 @@
 com.android.tools.r8.kotlin.KotlinClass -> com.android.tools.r8.x.b:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass kmClass -> e
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,com.android.tools.r8.graph.DexClass):37:37 -> <init>
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,com.android.tools.r8.graph.DexClass):39:39 -> <init>
     com.android.tools.r8.kotlin.KotlinClass asClass() -> a
-    1:3:com.android.tools.r8.kotlin.KotlinClass fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):31:33 -> a
-    4:37:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):49:82 -> a
-    1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():87:89 -> e
+    1:3:com.android.tools.r8.kotlin.KotlinClass fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):33:35 -> a
+    4:45:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):51:92 -> a
+    1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():100:102 -> e
     boolean isClass() -> f
-    1:3:void processMetadata():42:44 -> j
+    1:3:void processMetadata():44:46 -> j
 com.android.tools.r8.kotlin.KotlinClassFacade -> com.android.tools.r8.x.c:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():14:14 -> <clinit>
@@ -52830,8 +52718,7 @@
 com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.x.e:
     1:15:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):28:42 -> a
     16:16:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):40:40 -> a
-    17:19:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):36:38 -> a
-    20:20:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):36:36 -> a
+    17:20:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):36:36 -> a
     21:46:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):50:75 -> a
     21:46:com.android.tools.r8.kotlin.KotlinInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation):81 -> a
     47:388:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0:341 -> a
@@ -52911,11 +52798,53 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata metadata -> a
     boolean isProcessed -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):27:31 -> <init>
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):33:37 -> <init>
     com.android.tools.r8.kotlin.KotlinClass asClass() -> a
     void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
-    1:29:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):106:134 -> a
+    1:51:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):112:162 -> a
+    52:52:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):156:156 -> a
+    53:53:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):150:150 -> a
+    54:69:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):144:159 -> a
+    70:70:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):153:153 -> a
+    71:108:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):147:184 -> a
+    109:114:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):311:316 -> a
+    109:114:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    115:119:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.NamingLens.lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:69 -> a
+    115:119:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):316 -> a
+    115:119:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    120:125:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):321:326 -> a
+    120:125:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    126:126:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataJvmExtensionUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):28:28 -> a
+    126:126:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):326 -> a
+    126:126:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    127:228:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setFieldSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature):0:101 -> a
+    127:228:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):326 -> a
+    127:228:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    229:229:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.NamingLens.lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:69 -> a
+    229:229:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):316 -> a
+    229:229:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    230:241:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$GetterSetterCriteria com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.checkGetterCriteria():436:447 -> a
+    230:241:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):329 -> a
+    230:241:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    242:273:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):330:361 -> a
+    242:273:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    274:386:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):0:112 -> a
+    274:386:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):361 -> a
+    274:386:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    387:401:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$GetterSetterCriteria com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.checkSetterCriteria():456:470 -> a
+    387:401:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):364 -> a
+    387:401:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    402:448:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):365:411 -> a
+    402:448:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    449:572:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):0:123 -> a
+    449:572:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):411 -> a
+    449:572:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    573:573:com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup.toRenamedKmProperty(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):419:419 -> a
+    573:573:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):188 -> a
+    574:574:void rewriteDeclarationContainer(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):190:190 -> a
+    575:575:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder lambda$rewriteDeclarationContainer$0(com.android.tools.r8.graph.DexEncodedMethod,java.lang.String,java.lang.String):141:141 -> a
+    576:576:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder lambda$rewriteDeclarationContainer$1(com.android.tools.r8.graph.DexEncodedField,java.lang.String,java.lang.String):176:176 -> a
     com.android.tools.r8.kotlin.KotlinClassPart asClassPart() -> b
     com.android.tools.r8.kotlin.KotlinFile asFile() -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClass asSyntheticClass() -> d
@@ -52925,43 +52854,53 @@
     boolean isFile() -> h
     boolean isSyntheticClass() -> i
     void processMetadata() -> j
-    1:2:java.lang.String toString():96:97 -> toString
+    1:2:java.lang.String toString():102:103 -> toString
 com.android.tools.r8.kotlin.KotlinMemberInfo -> com.android.tools.r8.x.i:
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind memberKind -> a
-    com.android.tools.r8.kotlin.KotlinMemberInfo NO_KOTLIN_MEMBER_INFO -> b
+    int flag -> b
+    java.lang.String propertyName -> c
+    com.android.tools.r8.kotlin.KotlinMemberInfo NO_KOTLIN_MEMBER_INFO -> d
     1:1:void <clinit>():24:24 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind,int):35:36 -> <init>
+    2:2:void <init>(com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind,int):37:37 -> <clinit>
+    2:2:void <clinit>():24 -> <clinit>
+    3:3:void <clinit>():24:24 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind,int,java.lang.String):40:43 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinMemberInfo getNoKotlinMemberInfo():27:27 -> a
-    2:2:boolean com.android.tools.r8.kotlin.KotlinInfo.hasDeclarations():91:91 -> a
-    2:2:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinInfo):86 -> a
-    3:10:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinInfo):89:96 -> a
-    11:37:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):102:128 -> a
+    2:2:boolean com.android.tools.r8.kotlin.KotlinInfo.hasDeclarations():97:97 -> a
+    2:2:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinInfo):92 -> a
+    3:10:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinInfo):95:102 -> a
+    11:37:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):108:134 -> a
     38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataJvmExtensionUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):28:28 -> a
-    38:38:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):128 -> a
-    39:43:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):128:132 -> a
-    44:58:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):131:145 -> a
-    59:63:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):144:148 -> a
-    64:71:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):147:154 -> a
-    72:76:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):153:157 -> a
-    77:84:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):156:163 -> a
-    85:89:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):162:166 -> a
-    90:90:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):165:165 -> a
-    91:93:void lambda$markKotlinMemberInfo$0(java.util.Map,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):108:110 -> a
-    94:102:void lambda$markKotlinMemberInfo$1(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):114:122 -> a
+    38:38:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):134 -> a
+    39:44:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):134:139 -> a
+    45:60:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):137:152 -> a
+    61:61:void <init>(com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind,int):37:37 -> a
+    61:61:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):152 -> a
+    62:66:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):151:155 -> a
+    67:67:void <init>(com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind,int):37:37 -> a
+    67:67:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):155 -> a
+    68:78:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):154:164 -> a
+    79:87:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):160:168 -> a
+    88:99:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):166:177 -> a
+    100:108:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):173:181 -> a
+    109:109:void markKotlinMemberInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):179:179 -> a
+    110:112:void lambda$markKotlinMemberInfo$0(java.util.Map,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):114:116 -> a
+    113:121:void lambda$markKotlinMemberInfo$1(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):120:128 -> a
 com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind -> com.android.tools.r8.x.i$a:
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind EXTENSION_PROPERTY_SETTER -> i
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind EXTENSION_PROPERTY_GETTER -> h
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind PROPERTY_ANNOTATIONS -> g
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind PROPERTY_SETTER -> f
+    com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind[] $VALUES -> k
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind EXTENSION_PROPERTY_ANNOTATIONS -> j
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind NONE -> a
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind PROPERTY_GETTER -> e
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind PROPERTY_BACKING_FIELD -> d
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind EXTENSION_FUNCTION -> c
     com.android.tools.r8.kotlin.KotlinMemberInfo$MemberKind FUNCTION -> b
-    1:14:void <clinit>():41:54 -> <clinit>
-    1:1:void <init>(java.lang.String,int):40:40 -> <init>
-    1:1:boolean isExtensionProperty():79:79 -> a
+    1:14:void <clinit>():47:60 -> <clinit>
+    15:15:void <clinit>():46:46 -> <clinit>
+    1:1:void <init>(java.lang.String,int):46:46 -> <init>
 com.android.tools.r8.kotlin.KotlinMetadataJvmExtensionUtils -> com.android.tools.r8.x.p:
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):32:39 -> a
 com.android.tools.r8.kotlin.KotlinMetadataJvmExtensionUtils$KmFunctionProcessor -> com.android.tools.r8.x.l:
@@ -53018,8 +52957,7 @@
     1:5:void removeKotlinMetadataFromRenamedClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):50:54 -> a
     6:7:boolean isNotKotlinMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):59:60 -> a
     6:7:boolean lambda$removeKotlinMetadataFromRenamedClass$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):50 -> a
-    8:9:void run(java.util.concurrent.ExecutorService):64:65 -> a
-    10:10:void run(java.util.concurrent.ExecutorService):64:64 -> a
+    8:10:void run(java.util.concurrent.ExecutorService):64:64 -> a
     11:29:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):67:85 -> a
     30:32:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):94:96 -> a
     30:32:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):85 -> a
@@ -53045,44 +52983,83 @@
     92:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
     92:92:void removeKotlinMetadataFromRenamedClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):41 -> a
     93:93:void removeKotlinMetadataFromRenamedClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):45:45 -> a
-com.android.tools.r8.kotlin.KotlinMetadataSynthesizer -> com.android.tools.r8.x.r:
+com.android.tools.r8.kotlin.KotlinMetadataSynthesizer -> com.android.tools.r8.x.v:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:boolean isExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):30:30 -> a
-    2:2:boolean isExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):34:34 -> a
-    3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toKmType(java.lang.String):38:39 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):46:47 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toKmType(java.lang.String):38:39 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):47 -> a
-    9:21:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):50:62 -> a
-    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):64 -> a
-    23:28:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):65:70 -> a
-    29:34:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):79:84 -> a
-    35:35:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):0:0 -> a
-    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):84 -> a
-    36:61:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):0:25 -> a
-    36:61:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145 -> a
-    36:61:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):84 -> a
-    62:62:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145:145 -> a
-    62:62:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):84 -> a
-    63:64:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):85:86 -> a
-    65:75:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):113:123 -> a
-    76:76:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):0:0 -> a
-    76:76:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):123 -> a
-    77:96:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:19 -> a
-    77:96:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):71 -> a
-    77:96:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):123 -> a
-    97:97:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):71:71 -> a
-    97:97:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):123 -> a
-    98:98:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):124:124 -> a
-    99:411:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction.setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):0:312 -> a
-    99:411:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):128 -> a
-    412:422:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):130:140 -> a
-    423:434:boolean populateKmValueParameters(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):152:163 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):96:96 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionAsExtension(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):103:103 -> c
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.x.s:
+    1:1:void <clinit>():31:31 -> <clinit>
+    1:1:boolean isExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):34:34 -> a
+    2:2:boolean isExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):38:38 -> a
+    3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toKmType(java.lang.String):42:43 -> a
+    5:19:java.lang.String toRenamedClassifier(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):50:64 -> a
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    20:20:java.lang.String toRenamedClassifier(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):66 -> a
+    21:23:java.lang.String toRenamedClassifier(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):67:69 -> a
+    24:29:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90:95 -> a
+    30:30:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):0:0 -> a
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):95 -> a
+    31:56:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):0:25 -> a
+    31:56:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145 -> a
+    31:56:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):95 -> a
+    57:57:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145:145 -> a
+    57:57:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):95 -> a
+    58:59:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):96:97 -> a
+    60:76:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):124:140 -> a
+    77:77:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):0:0 -> a
+    77:77:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):140 -> a
+    78:97:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:19 -> a
+    78:97:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):71 -> a
+    78:97:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):140 -> a
+    98:98:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):71:71 -> a
+    98:98:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):140 -> a
+    99:99:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):141:141 -> a
+    100:412:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction.setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):0:312 -> a
+    100:412:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):145 -> a
+    413:423:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):147:157 -> a
+    424:435:boolean populateKmValueParameters(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):169:180 -> a
+    1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):74:81 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):107:107 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionAsExtension(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):114:114 -> c
+com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$1 -> com.android.tools.r8.x.r:
+com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup -> com.android.tools.r8.x.u:
+    com.android.tools.r8.graph.DexEncodedMethod setter -> e
+    com.android.tools.r8.graph.DexEncodedMethod getter -> d
+    boolean isExtension -> g
+    boolean $assertionsDisabled -> h
+    java.lang.String name -> b
+    com.android.tools.r8.graph.DexEncodedField field -> c
+    int flag -> a
+    com.android.tools.r8.graph.DexEncodedMethod annotations -> f
+    1:1:void <clinit>():210:210 -> <clinit>
+    1:1:void <init>(int,java.lang.String,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$1):210:210 -> <init>
+    2:9:void <init>(int,java.lang.String,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean):226:233 -> <init>
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder builder(int,java.lang.String):237:237 -> a
+    1:29:java.lang.String toString():476:504 -> toString
+com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder -> com.android.tools.r8.x.s:
+    boolean isExtensionAnnotations -> i
+    com.android.tools.r8.graph.DexEncodedMethod setter -> e
+    com.android.tools.r8.graph.DexEncodedMethod getter -> d
+    boolean isExtensionGetter -> g
+    boolean isExtensionSetter -> h
+    java.lang.String name -> b
+    com.android.tools.r8.graph.DexEncodedField field -> c
+    int flag -> a
+    com.android.tools.r8.graph.DexEncodedMethod annotations -> f
+    1:1:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$1):240:240 -> <init>
+    2:4:void <init>(int,java.lang.String):252:254 -> <init>
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder foundBackingField(com.android.tools.r8.graph.DexEncodedField):258:258 -> a
+    2:2:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder foundAnnotations(com.android.tools.r8.graph.DexEncodedMethod):273:273 -> a
+    3:16:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup build():293:306 -> a
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder foundGetter(com.android.tools.r8.graph.DexEncodedMethod):263:263 -> b
+    2:2:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder isExtensionAnnotations():288:288 -> b
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder foundSetter(com.android.tools.r8.graph.DexEncodedMethod):268:268 -> c
+    2:2:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder isExtensionGetter():278:278 -> c
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$Builder isExtensionSetter():283:283 -> d
+com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$GetterSetterCriteria -> com.android.tools.r8.x.t:
+    com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$GetterSetterCriteria NOT_AVAILABLE -> a
+    com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$GetterSetterCriteria VIOLATE -> c
+    com.android.tools.r8.kotlin.KotlinMetadataSynthesizer$KmPropertyGroup$GetterSetterCriteria MET -> b
+    1:3:void <clinit>():426:428 -> <clinit>
+    1:1:void <init>(java.lang.String,int):425:425 -> <init>
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.x.w:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:21:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):113:133 -> a
@@ -53119,8 +53096,8 @@
     2:26:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
     27:34:void addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):239:246 -> b
     27:34:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.x.s$a:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.x.s$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.x.w$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.x.w$b:
     java.io.BufferedReader reader -> a
     java.lang.String readLine -> b
     boolean $assertionsDisabled -> c
@@ -53134,25 +53111,25 @@
     1:1:java.lang.String readNextLine():49:49 -> b
     2:5:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):69:72 -> b
     1:1:void close():108:108 -> close
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.x.s$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.x.w$c:
     1:1:void <init>(java.lang.String):34:34 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.x.s$d:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.x.w$d:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source source -> a
     com.android.tools.r8.naming.Range range -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):304:306 -> <init>
     1:1:com.android.tools.r8.naming.Range getRange():314:314 -> a
     1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():310:310 -> b
     1:10:java.lang.String toString():319:328 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.x.s$e:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.x.w$e:
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:2:void <init>(com.android.tools.r8.utils.SegmentTree):254:255 -> <init>
     1:1:java.util.Map$Entry lookup(int):259:259 -> a
     2:2:int size():263:263 -> a
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.x.s$f:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.x.w$f:
     java.util.Map files -> b
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:4:void <init>():267:270 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.x.s$g:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.x.w$g:
     java.lang.String fileName -> a
     java.lang.String path -> b
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):277:277 -> <init>
@@ -53160,7 +53137,7 @@
     1:1:java.lang.String getFileName():287:287 -> a
     1:1:java.lang.String getPath():291:291 -> b
     1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.x.u:
+com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.x.y:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour flavour -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():14:14 -> <clinit>
@@ -53179,7 +53156,7 @@
     1:3:void processMetadata():45:47 -> j
     1:1:boolean isJavaStyleLambda():74:74 -> k
     1:1:boolean isKotlinStyleLambda():70:70 -> l
-com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.x.t:
+com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.x.x:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour Unclassified -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour JavaStyleLambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour KotlinStyleLambda -> a
@@ -53215,8 +53192,8 @@
     3:9:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):81:87 -> a
     10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):71:71 -> a
     10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):87 -> a
-    11:15:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96:100 -> a
-    16:20:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96:100 -> a
+    11:16:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96:96 -> a
+    20:20:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):100:100 -> a
     21:24:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):126:129 -> a
     25:25:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
     25:25:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129 -> a
@@ -53335,8 +53312,7 @@
 com.android.tools.r8.naming.ClassNameMinifier$1 -> com.android.tools.r8.naming.c$a:
     com.android.tools.r8.naming.ClassNameMinifier this$0 -> a
     1:1:void <init>(com.android.tools.r8.naming.ClassNameMinifier):140:140 -> <init>
-    1:2:java.util.Iterator iterator():143:144 -> iterator
-    3:3:java.util.Iterator iterator():143:143 -> iterator
+    1:3:java.util.Iterator iterator():143:143 -> iterator
 com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy -> com.android.tools.r8.naming.c$b:
     boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate) -> a
@@ -53363,7 +53339,7 @@
     1:1:int getDictionaryIndex():408:408 -> b
     1:1:java.lang.String getPackageName():388:388 -> c
     1:1:java.lang.String nextPackagePrefix():400:400 -> d
-    2:3:java.lang.String com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy.next(char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):209:210 -> d
+    2:3:java.lang.String com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy.next(char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):205:206 -> d
     2:3:java.lang.String nextPackagePrefix():400 -> d
     4:5:java.lang.String nextPackagePrefix():401:402 -> d
 com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy -> com.android.tools.r8.naming.c$e:
@@ -53390,13 +53366,7 @@
     3:4:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):138 -> a
     5:6:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):153:154 -> a
     5:6:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):139 -> a
-    7:8:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):162:163 -> a
-    9:9:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getRenamedSignature():79:79 -> a
-    9:9:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):164 -> a
-    10:17:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):164:171 -> a
-    18:18:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getRenamedSignature():79:79 -> a
-    18:18:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):172 -> a
-    19:19:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):172:172 -> a
+    7:17:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):162:172 -> a
     1:11:boolean equals(java.lang.Object):221:231 -> equals
     1:1:int hashCode():236:236 -> hashCode
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
@@ -53429,26 +53399,29 @@
     java.util.Map mappedRangesByRenamedName -> e
     java.lang.String renamedName -> b
     java.util.Map mappedNamingsByName -> f
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:1:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForNameMapper$1):29:29 -> <init>
-    2:8:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map):208:214 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder builder(java.lang.String,java.lang.String):182:182 -> a
-    2:8:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):219:225 -> a
-    9:17:java.util.List lookupByOriginalName(java.lang.String):250:258 -> a
-    18:24:void write(java.io.Writer):288:294 -> a
-    25:26:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):274:275 -> a
-    25:26:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):267 -> a
-    25:26:void write(java.io.Writer):294 -> a
-    27:28:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):282:283 -> a
-    27:28:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):268 -> a
-    27:28:void write(java.io.Writer):294 -> a
-    29:35:void write(java.io.Writer):303:309 -> a
-    36:37:void lambda$write$0(java.io.Writer,com.android.tools.r8.naming.MemberNaming):296:297 -> a
-    38:38:int lambda$write$1(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):307:307 -> a
-    1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):231:241 -> b
-    1:11:boolean equals(java.lang.Object):329:339 -> equals
-    1:5:int hashCode():344:348 -> hashCode
-    1:5:java.lang.String toString():316:320 -> toString
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForNameMapper$1):30:30 -> <init>
+    2:8:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map):209:215 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder builder(java.lang.String,java.lang.String):183:183 -> a
+    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName getMappedRangesForRenamedName(java.lang.String):219:219 -> a
+    3:9:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):224:230 -> a
+    10:10:java.util.Collection allFieldNamings():285:285 -> a
+    11:17:void write(java.io.Writer):301:307 -> a
+    18:19:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):279:280 -> a
+    18:19:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):272 -> a
+    18:19:void write(java.io.Writer):307 -> a
+    20:21:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):291:292 -> a
+    20:21:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):273 -> a
+    20:21:void write(java.io.Writer):307 -> a
+    22:28:void write(java.io.Writer):316:322 -> a
+    29:30:void lambda$write$0(java.io.Writer,com.android.tools.r8.naming.MemberNaming):309:310 -> a
+    31:31:int lambda$write$1(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):320:320 -> a
+    1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):236:246 -> b
+    12:20:java.util.List lookupByOriginalName(java.lang.String):255:263 -> b
+    21:21:java.util.Collection allMethodNamings():297:297 -> b
+    1:11:boolean equals(java.lang.Object):342:352 -> equals
+    1:5:int hashCode():357:361 -> hashCode
+    1:5:java.lang.String toString():329:333 -> toString
 com.android.tools.r8.naming.ClassNamingForNameMapper$1 -> com.android.tools.r8.naming.g$a:
 com.android.tools.r8.naming.ClassNamingForNameMapper$Builder -> com.android.tools.r8.naming.g$b:
     java.util.Map methodMembers -> c
@@ -53457,20 +53430,14 @@
     java.util.Map mappedRangesByName -> e
     java.lang.String renamedName -> b
     java.util.Map mappedNamingsByName -> f
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):31:31 -> <init>
-    2:2:void <init>(java.lang.String,java.lang.String):39:39 -> <init>
-    3:10:void <init>(java.lang.String,java.lang.String):34:41 -> <init>
-    1:2:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):46:47 -> a
-    3:3:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getRenamedSignature():79:79 -> a
-    3:3:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):47 -> a
-    4:6:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):47:49 -> a
-    7:7:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getRenamedSignature():79:79 -> a
-    7:7:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):49 -> a
-    8:12:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):49:53 -> a
-    13:22:com.android.tools.r8.naming.ClassNamingForNameMapper build():61:70 -> a
-    23:25:void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):81:83 -> a
-    26:26:java.util.List lambda$addMappedRange$1(java.lang.String):82:82 -> a
-    1:1:java.util.List lambda$addMemberEntry$0(java.lang.String):52:52 -> b
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):32:32 -> <init>
+    2:2:void <init>(java.lang.String,java.lang.String):40:40 -> <init>
+    3:10:void <init>(java.lang.String,java.lang.String):35:42 -> <init>
+    1:8:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):47:54 -> a
+    9:18:com.android.tools.r8.naming.ClassNamingForNameMapper build():62:71 -> a
+    19:21:void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):82:84 -> a
+    22:22:java.util.List lambda$addMappedRange$1(java.lang.String):83:83 -> a
+    1:1:java.util.List lambda$addMemberEntry$0(java.lang.String):53:53 -> b
 com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange -> com.android.tools.r8.naming.g$c:
     com.android.tools.r8.naming.Range minifiedRange -> a
     int nextSequenceNumber -> f
@@ -53479,26 +53446,26 @@
     int sequenceNumber -> e
     com.android.tools.r8.naming.MemberNaming$MethodSignature signature -> b
     java.lang.String renamedName -> d
-    1:3:void <clinit>():370:372 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):370:370 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):390:390 -> <init>
-    3:16:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):387:400 -> <init>
-    1:1:int access$400(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):370:370 -> a
-    2:2:int getNextSequenceNumber():375:375 -> a
-    3:17:int getOriginalLineNumber(int):404:418 -> a
-    1:10:boolean equals(java.lang.Object):453:462 -> equals
-    1:4:int hashCode():468:471 -> hashCode
-    1:10:java.lang.String toString():434:443 -> toString
+    1:3:void <clinit>():383:385 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):383:383 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):403:403 -> <init>
+    3:16:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):400:413 -> <init>
+    1:1:int access$400(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):383:383 -> a
+    2:2:int getNextSequenceNumber():388:388 -> a
+    3:22:int getOriginalLineNumber(int):417:436 -> a
+    1:10:boolean equals(java.lang.Object):471:480 -> equals
+    1:4:int hashCode():486:489 -> hashCode
+    1:10:java.lang.String toString():452:461 -> toString
 com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName -> com.android.tools.r8.naming.g$d:
     java.util.List mappedRanges -> a
-    1:2:void <init>(java.util.List):91:92 -> <init>
-    1:1:java.util.List access$300(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):88:88 -> a
-    2:2:java.util.List allRangesForLine(int):122:122 -> a
-    3:22:java.util.List allRangesForLine(int,boolean):135:154 -> a
-    23:23:java.util.List getMappedRanges():158:158 -> a
-    1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):101:108 -> b
-    1:7:boolean equals(java.lang.Object):166:172 -> equals
-    1:1:int hashCode():177:177 -> hashCode
+    1:2:void <init>(java.util.List):92:93 -> <init>
+    1:1:java.util.List access$300(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):89:89 -> a
+    2:2:java.util.List allRangesForLine(int):123:123 -> a
+    3:22:java.util.List allRangesForLine(int,boolean):136:155 -> a
+    23:23:java.util.List getMappedRanges():159:159 -> a
+    1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):102:109 -> b
+    1:7:boolean equals(java.lang.Object):167:173 -> equals
+    1:1:int hashCode():178:178 -> hashCode
 com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.naming.h:
     java.nio.file.Path path -> b
     java.io.BufferedReader reader -> a
@@ -53680,26 +53647,23 @@
     com.android.tools.r8.naming.NamingLens lens -> c
     com.android.tools.r8.shaking.ProguardClassFilter adaptClassStrings -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):42:45 -> <init>
-    1:2:void adaptClassStrings(java.util.concurrent.ExecutorService):56:57 -> a
-    3:3:void adaptClassStrings(java.util.concurrent.ExecutorService):56:56 -> a
-    4:5:void lambda$adaptClassStrings$0(com.android.tools.r8.graph.DexProgramClass):59:60 -> a
-    6:10:void adaptClassStringsInStaticField(com.android.tools.r8.graph.DexEncodedField):71:75 -> a
-    6:10:void lambda$adaptClassStrings$0(com.android.tools.r8.graph.DexProgramClass):61 -> a
-    11:11:void lambda$adaptClassStrings$0(com.android.tools.r8.graph.DexProgramClass):63:63 -> a
-    12:31:void adaptClassStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod):81:100 -> a
-    32:43:com.android.tools.r8.graph.DexString getRenamedStringLiteral(com.android.tools.r8.graph.DexString):107:118 -> a
-    44:44:boolean lambda$getRenamedStringLiteral$1(java.lang.String,com.android.tools.r8.graph.DexType):111:111 -> a
-    1:2:void replaceDexItemBasedConstString(java.util.concurrent.ExecutorService):126:127 -> b
-    3:3:void replaceDexItemBasedConstString(java.util.concurrent.ExecutorService):126:126 -> b
-    4:4:void lambda$replaceDexItemBasedConstString$2(com.android.tools.r8.graph.DexProgramClass):130:130 -> b
-    5:11:void replaceDexItemBasedConstStringInStaticField(com.android.tools.r8.graph.DexEncodedField):142:148 -> b
-    5:11:void lambda$replaceDexItemBasedConstString$2(com.android.tools.r8.graph.DexProgramClass):131 -> b
-    12:14:void lambda$replaceDexItemBasedConstString$2(com.android.tools.r8.graph.DexProgramClass):133:135 -> b
-    15:21:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):153:159 -> b
-    22:54:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):154:186 -> b
-    1:4:void run(java.util.concurrent.ExecutorService):49:52 -> c
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):41:44 -> <init>
+    1:3:void adaptClassStrings(java.util.concurrent.ExecutorService):55:55 -> a
+    4:5:void lambda$adaptClassStrings$0(com.android.tools.r8.graph.DexProgramClass):58:59 -> a
+    6:10:void adaptClassStringsInStaticField(com.android.tools.r8.graph.DexEncodedField):70:74 -> a
+    6:10:void lambda$adaptClassStrings$0(com.android.tools.r8.graph.DexProgramClass):60 -> a
+    11:11:void lambda$adaptClassStrings$0(com.android.tools.r8.graph.DexProgramClass):62:62 -> a
+    12:31:void adaptClassStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod):80:99 -> a
+    32:43:com.android.tools.r8.graph.DexString getRenamedStringLiteral(com.android.tools.r8.graph.DexString):106:117 -> a
+    44:44:boolean lambda$getRenamedStringLiteral$1(java.lang.String,com.android.tools.r8.graph.DexType):110:110 -> a
+    1:3:void replaceDexItemBasedConstString(java.util.concurrent.ExecutorService):125:125 -> b
+    4:4:void lambda$replaceDexItemBasedConstString$2(com.android.tools.r8.graph.DexProgramClass):129:129 -> b
+    5:11:void replaceDexItemBasedConstStringInStaticField(com.android.tools.r8.graph.DexEncodedField):141:147 -> b
+    5:11:void lambda$replaceDexItemBasedConstString$2(com.android.tools.r8.graph.DexProgramClass):130 -> b
+    12:14:void lambda$replaceDexItemBasedConstString$2(com.android.tools.r8.graph.DexProgramClass):132:134 -> b
+    15:39:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):152:176 -> b
+    1:4:void run(java.util.concurrent.ExecutorService):48:51 -> c
 com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.naming.o:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> b
@@ -53709,8 +53673,7 @@
     1:4:void <init>(com.android.tools.r8.graph.AppView):60:63 -> <init>
     boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$1(com.android.tools.r8.ir.code.ConstString,com.android.tools.r8.ir.code.Instruction) -> a
     boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:void decoupleIdentifierNameStringsInFields(java.util.concurrent.ExecutorService):68:69 -> a
-    3:3:void decoupleIdentifierNameStringsInFields(java.util.concurrent.ExecutorService):68:68 -> a
+    1:3:void decoupleIdentifierNameStringsInFields(java.util.concurrent.ExecutorService):68:68 -> a
     4:4:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):71:71 -> a
     5:17:void decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):80:92 -> a
     5:17:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):72 -> a
@@ -53719,40 +53682,40 @@
     19:49:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):102:132 -> a
     50:50:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):131:131 -> a
     51:51:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):128:128 -> a
-    52:106:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):144:198 -> a
-    52:106:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):127 -> a
-    107:107:com.android.tools.r8.ir.code.FieldInstruction com.android.tools.r8.ir.code.FieldInstruction.asFieldInstruction():0:0 -> a
-    107:107:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):145 -> a
-    107:107:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):127 -> a
-    108:225:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):208:325 -> a
-    226:229:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216:219 -> a
-    230:231:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344:345 -> a
-    230:231:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
-    232:233:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
-    232:233:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):345 -> a
-    232:233:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
-    234:240:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):346:352 -> a
-    234:240:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
-    241:250:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:360 -> a
-    241:250:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
-    251:251:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):359:359 -> a
-    251:251:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
-    252:277:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):224:249 -> a
-    278:278:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> a
-    278:278:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):249 -> a
-    279:279:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> a
-    279:279:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298 -> a
-    279:279:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):249 -> a
-    280:360:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):252:332 -> a
-    361:367:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331:337 -> a
-    368:368: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
-    368:368:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):336 -> a
-    369:372:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):335:338 -> a
-    373:373:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):333:333 -> a
-    374:380:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):369:375 -> a
-    381:381:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    381:381:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):375 -> a
-    382:403:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):377:398 -> a
+    52: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):144:196 -> a
+    52:104:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):127 -> a
+    105:105:com.android.tools.r8.ir.code.FieldInstruction com.android.tools.r8.ir.code.FieldInstruction.asFieldInstruction():0:0 -> a
+    105:105:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):145 -> a
+    105:105:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):127 -> a
+    106:223:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):207:324 -> a
+    224:227:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):215:218 -> a
+    228:229:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):342:343 -> 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):222 -> a
+    230:231:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
+    230:231:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):343 -> 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):222 -> a
+    232:238:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344:350 -> 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):222 -> a
+    239:248:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):349:358 -> 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):222 -> a
+    249:249:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):357:357 -> 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):222 -> 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):223:248 -> a
+    276:276:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> a
+    276:276:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):248 -> a
+    277:277:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):22:22 -> 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):298 -> 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):248 -> a
+    278:358: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):251:331 -> a
+    359: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):330:336 -> a
+    366:366: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
+    366: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):335 -> a
+    367:367:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):334:334 -> a
+    368:368:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):332:332 -> a
+    369: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:373 -> a
+    376:376:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    376:376: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):373 -> a
+    377:398:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):375:396 -> a
 com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.naming.p:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -53798,149 +53761,160 @@
     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):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
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.naming.s:
-    com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
+    com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> c
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.com.google.common.base.Equivalence equivalence -> c
-    boolean $assertionsDisabled -> h
-    java.util.Set desugaredCallSites -> b
-    java.util.Map callSiteRenamings -> e
-    java.util.Map globalStateMap -> f
-    java.util.Map interfaceStateMap -> g
-    1:1:void <clinit>():97:97 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.naming.MethodNameMinifier$State):377:377 -> <init>
-    2:20:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.naming.MethodNameMinifier$State):366:384 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> a
-    2:2:java.util.Map getCallSiteRenamings():392:392 -> a
-    3:5:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):406:408 -> a
-    6:8:void reserveNamesInInterfaces(java.util.Collection):396:398 -> a
-    6:8:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    9:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:107 -> a
-    9:10:void reserveNamesInInterfaces(java.util.Collection):398 -> a
-    9:10:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:106 -> a
-    11:11:void reserveNamesInInterfaces(java.util.Collection):398 -> a
-    11:11:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    12:14:void reserveNamesInInterfaces(java.util.Collection):399:401 -> a
-    12:14:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    15:19:void patchUpChildrenInReservationStates():572:576 -> a
-    15:19:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):412 -> a
-    20:25:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):413:418 -> a
-    26:32:void computeReservationFrontiersForAllImplementingClasses():583:589 -> a
-    26:32:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):419 -> a
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):111:111 -> a
-    33:33:void computeReservationFrontiersForAllImplementingClasses():589 -> a
-    33:33:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):419 -> a
-    34:35:void computeReservationFrontiersForAllImplementingClasses():590:591 -> a
-    34:35:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):419 -> a
-    36:120:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):420:504 -> a
-    121:130:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):499:508 -> a
-    131:145:boolean verifyAllMethodsAreRepresentedIn(java.util.List):618:632 -> a
-    131:145:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):508 -> a
-    146:146:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):509:509 -> a
-    147:161:boolean verifyAllCallSitesAreRepresentedIn(java.util.List):599:613 -> a
-    147:161:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):509 -> a
-    162:196:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):511:545 -> a
-    197:205:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.io.PrintStream):637:645 -> a
-    197:205:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):545 -> a
-    206:213:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):548:555 -> a
-    214:214:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):426:426 -> a
-    215:234:void lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):448:467 -> a
-    235:236:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):128:129 -> a
-    235:236:void lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):468 -> a
-    237:238:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
-    237:238:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):132 -> a
-    237:238:void lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):468 -> a
-    239:240:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
-    239:240:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
-    239:240:void lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):468 -> a
-    241:242:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
-    241:242:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
-    241:242:void lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):468 -> a
-    243:243:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
-    243:243:void lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):468 -> a
-    244:247:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):559:562 -> a
-    248:248:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> a
-    248:248:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):562 -> a
-    249:252:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):564:567 -> a
-    253:253:boolean lambda$assignNewName$2(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):566:566 -> a
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$State access$100(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> b
-    2:2:java.util.Comparator getDefaultInterfaceMethodOrdering():388:388 -> b
-    1:1:java.util.Map access$200(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> c
+    java.util.Map callSiteRenamings -> d
+    com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
+    boolean $assertionsDisabled -> g
+    java.util.Map globalStateMap -> e
+    java.util.Map interfaceStateMap -> f
+    1:1:void <clinit>():98:98 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNameMinifier$State):376:376 -> <init>
+    2:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNameMinifier$State):368:382 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.naming.InterfaceMethodNameMinifier):98:98 -> a
+    2:2:java.util.Map getCallSiteRenamings():390:390 -> a
+    3:5:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):404:406 -> a
+    6:8:void reserveNamesInInterfaces(java.util.Collection):394:396 -> a
+    6:8:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):407 -> a
+    9:11:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:105 -> a
+    9:11:void reserveNamesInInterfaces(java.util.Collection):396 -> a
+    9:11:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):407 -> a
+    12:14:void reserveNamesInInterfaces(java.util.Collection):397:399 -> a
+    12:14:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):407 -> a
+    15:19:void patchUpChildrenInReservationStates():628:632 -> a
+    15:19:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):410 -> a
+    20:25:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):411:416 -> a
+    26:32:void computeReservationFrontiersForAllImplementingClasses():639:645 -> a
+    26:32:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):417 -> a
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):110:110 -> a
+    33:33:void computeReservationFrontiersForAllImplementingClasses():645 -> a
+    33:33:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):417 -> a
+    34:35:void computeReservationFrontiersForAllImplementingClasses():646:647 -> a
+    34:35:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):417 -> a
+    36:151:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):418:533 -> a
+    152:161:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):528:537 -> a
+    162:176:boolean verifyAllMethodsAreRepresentedIn(java.util.List):674:688 -> a
+    162:176:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):537 -> a
+    177:177:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):538:538 -> a
+    178:192:boolean verifyAllCallSitesAreRepresentedIn(java.util.List):655:669 -> a
+    178:192:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):538 -> a
+    193:227:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):540:574 -> a
+    228:236:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.io.PrintStream):693:701 -> a
+    228:236:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):574 -> a
+    237:251:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):577:591 -> a
+    252:252:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    252:252:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):591 -> a
+    253:258:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):592:597 -> a
+    259:259:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    259:259:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):598 -> a
+    260:266:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):599:605 -> a
+    267:267:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):424:424 -> a
+    268:295:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):446:473 -> a
+    296:296:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    296:296:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):473 -> a
+    297:307:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):474:484 -> a
+    308:321:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):483:496 -> a
+    322:323:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):128:129 -> a
+    322:323:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):497 -> a
+    324:325:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
+    324:325:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):132 -> a
+    324:325:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):497 -> a
+    326:328:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:91 -> a
+    326:328:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
+    326:328:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):497 -> a
+    329:329:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):92:92 -> a
+    329:329:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
+    329:329:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):497 -> a
+    330:330:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
+    330:330:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):497 -> a
+    331:334:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):609:612 -> a
+    335:335:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    335:335:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):612 -> a
+    336:339:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):614:617 -> a
+    340:340:boolean lambda$assignNewName$3(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):616:616 -> a
+    341:341:com.android.tools.r8.graph.DexString newNameInGroup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):624:624 -> a
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$State access$100(com.android.tools.r8.naming.InterfaceMethodNameMinifier):98:98 -> b
+    2:2:java.util.Comparator getDefaultInterfaceMethodOrdering():386:386 -> b
+    3:3:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):485:485 -> b
+    4:4:boolean lambda$newNameInGroup$4(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):624:624 -> b
+    1:1:java.util.Map access$200(com.android.tools.r8.naming.InterfaceMethodNameMinifier):98:98 -> c
 com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState -> com.android.tools.r8.naming.q:
     java.util.Map methodStates -> b
-    com.android.tools.r8.naming.InterfaceMethodNameMinifier this$0 -> c
+    java.util.List callSiteCollidingMethods -> c
     java.util.Set callSites -> a
-    1:4:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier):240:243 -> <init>
-    1:1:java.util.Set access$300(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):240:240 -> a
-    2:2:void addState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):246:246 -> a
-    3:3:java.util.Set lambda$addState$0(com.android.tools.r8.graph.DexMethod):246:246 -> a
-    4:4:void addCallSite(com.android.tools.r8.graph.DexCallSite):259:259 -> a
-    5:17:com.android.tools.r8.graph.DexString getReservedName():263:275 -> a
-    18:26:boolean isAvailable(com.android.tools.r8.graph.DexString):302:310 -> a
-    27:28:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):305:306 -> a
-    29:29:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):314:314 -> a
-    30:30:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):316:316 -> a
-    31:31:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> a
-    31:31:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):317 -> a
-    32:32:void forEachState(java.util.function.BiConsumer):322:322 -> a
-    33:33:java.lang.Object lambda$forEachState$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):324:324 -> a
-    34:36:java.lang.Object forAnyState(java.util.function.BiFunction):331:333 -> a
-    37:39:boolean containsReservation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):343:345 -> a
-    40:40:boolean com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState.containsReservation(com.android.tools.r8.graph.DexType):236:236 -> a
-    40:40:boolean containsReservation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):346 -> a
-    1:1:java.util.Map access$400(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):240:240 -> b
-    2:2:java.util.Set lambda$appendMethodGroupState$1(com.android.tools.r8.graph.DexMethod):252:252 -> b
-    3:3:void reserveName(com.android.tools.r8.graph.DexString):288:288 -> b
-    4:7:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290:293 -> b
-    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> b
-    8:8:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
-    9:10:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):295:296 -> b
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> b
-    11:11:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):296 -> b
-    1:3:void appendMethodGroupState(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):250:252 -> c
-    1:1:int compareTo(java.lang.Object):240:240 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):357:357 -> compareTo
-    2:2:int compareTo(java.lang.Object):240 -> compareTo
+    com.android.tools.r8.naming.InterfaceMethodNameMinifier this$0 -> d
+    1:5:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier):241:245 -> <init>
+    1:1:java.util.Set access$300(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):241:241 -> a
+    2:2:void addState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):248:248 -> a
+    3:3:java.util.Set lambda$addState$0(com.android.tools.r8.graph.DexMethod):248:248 -> a
+    4:4:void addCallSite(com.android.tools.r8.graph.DexCallSite):262:262 -> a
+    5:17:com.android.tools.r8.graph.DexString getReservedName():266:278 -> a
+    18:26:boolean isAvailable(com.android.tools.r8.graph.DexString):305:313 -> a
+    27:28:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):308:309 -> a
+    29:29:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):317:317 -> a
+    30:30:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):319:319 -> a
+    31:31:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> a
+    31:31:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):320 -> a
+    32:32:void forEachState(java.util.function.BiConsumer):325:325 -> a
+    33:33:java.lang.Object lambda$forEachState$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):327:327 -> a
+    34:36:java.lang.Object forAnyState(java.util.function.BiFunction):334:336 -> a
+    37:39:boolean containsReservation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):346:348 -> a
+    40:40:boolean com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState.containsReservation(com.android.tools.r8.graph.DexType):237:237 -> a
+    40:40:boolean containsReservation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):349 -> a
+    1:1:java.util.Map access$400(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):241:241 -> b
+    2:2:java.util.Set lambda$appendMethodGroupState$1(com.android.tools.r8.graph.DexMethod):255:255 -> b
+    3:3:void reserveName(com.android.tools.r8.graph.DexString):291:291 -> b
+    4:7:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293:296 -> b
+    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> b
+    8:8:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):296 -> b
+    9:10:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):298:299 -> b
+    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> b
+    11:11:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):299 -> b
+    1:1:java.util.List access$500(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):241:241 -> c
+    1:1:int compareTo(java.lang.Object):241:241 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):360:360 -> compareTo
+    2:2:int compareTo(java.lang.Object):241 -> compareTo
+    1:4:void appendMethodGroupState(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):252:255 -> d
 com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState -> com.android.tools.r8.naming.r:
     com.android.tools.r8.graph.DexClass iface -> a
     java.util.Set reservationTypes -> c
     boolean $assertionsDisabled -> e
     java.util.Set children -> b
     com.android.tools.r8.naming.InterfaceMethodNameMinifier this$0 -> d
-    1:1:void <clinit>():99:99 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):108:108 -> <init>
-    2:7:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):104:109 -> <init>
-    1:2:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):115:116 -> a
+    1:1:void <clinit>():100:100 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):109:109 -> <init>
+    2:7:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):105:110 -> <init>
+    1:2:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):116:117 -> a
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> a
-    3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):116 -> a
-    4:4:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):118:118 -> a
-    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):115:115 -> a
-    5:5:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):118 -> a
-    6:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):126:141 -> a
-    22:29:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):129:136 -> a
-    30:30:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):171:171 -> a
-    31:31:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):173:173 -> a
-    32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:175 -> a
-    33:33:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> a
-    33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175 -> a
-    34:35:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):72:73 -> a
-    34:35:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176 -> a
-    36:36:void forAll(java.util.function.Consumer):182:182 -> a
-    37:37:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):184:184 -> a
-    38:46:java.lang.Object forAny(java.util.function.Function):190:198 -> a
-    1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):149:149 -> b
-    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):98:98 -> b
-    2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):149 -> b
-    3:3:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):150:150 -> b
-    4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):156:167 -> b
-    16:17:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):159:160 -> b
-    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> b
-    18:18:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):160 -> b
-    19:20:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):161:162 -> b
-    21:28:java.lang.Object forChildren(java.util.function.Function):219:226 -> b
-    1:1:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):145:145 -> c
-    2:2:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):147:147 -> c
-    3:10:java.lang.Object forParents(java.util.function.Function):202:209 -> c
+    3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):117 -> a
+    4:4:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):119:119 -> a
+    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):114:114 -> a
+    5:5:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):119 -> a
+    6:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):127:142 -> a
+    22:29:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):130:137 -> a
+    30:30:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):172:172 -> a
+    31:31:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):174:174 -> a
+    32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176:176 -> a
+    33:33:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176 -> a
+    34:35:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):76:77 -> a
+    34:35:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):177 -> a
+    36:36:void forAll(java.util.function.Consumer):183:183 -> a
+    37:37:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):185:185 -> a
+    38:46:java.lang.Object forAny(java.util.function.Function):191:199 -> a
+    1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):150:150 -> b
+    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):97:97 -> b
+    2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):150 -> b
+    3:3:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):151:151 -> b
+    4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):157:168 -> b
+    16:17:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):160:161 -> b
+    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> b
+    18:18:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):161 -> b
+    19:20:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):162:163 -> b
+    21:28:java.lang.Object forChildren(java.util.function.Function):220:227 -> b
+    1:1:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):146:146 -> c
+    2:2:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):148:148 -> c
+    3:10:java.lang.Object forParents(java.util.function.Function):203:210 -> c
 com.android.tools.r8.naming.InternalNamingState -> com.android.tools.r8.naming.t:
     int incrementDictionaryIndex() -> a
     int incrementNameIndex(boolean) -> a
@@ -53952,8 +53926,9 @@
     1:4:void <init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.position.Position):64:67 -> <init>
     1:1:com.android.tools.r8.naming.MemberNaming$Signature getOriginalSignature():71:71 -> a
     1:1:java.lang.String getRenamedName():83:83 -> b
-    1:1:boolean isFieldNaming():91:91 -> c
-    1:1:boolean isMethodNaming():87:87 -> d
+    1:1:com.android.tools.r8.naming.MemberNaming$Signature getRenamedSignature():79:79 -> c
+    1:1:boolean isFieldNaming():91:91 -> d
+    1:1:boolean isMethodNaming():87:87 -> e
     1:6:boolean equals(java.lang.Object):38:43 -> equals
     1:2:int hashCode():48:49 -> hashCode
     1:1:java.lang.String toString():100:100 -> toString
@@ -53966,8 +53941,7 @@
     3:3:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():131:131 -> a
     3:3:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
     4:5:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):186:187 -> a
-    6:9:com.android.tools.r8.graph.DexField toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):191:194 -> a
-    10:10:com.android.tools.r8.graph.DexField toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):191:191 -> a
+    6:10:com.android.tools.r8.graph.DexField toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):191:191 -> a
     11:11:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):199:199 -> a
     12:14:void write(java.io.Writer):231:233 -> a
     1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():204:204 -> c
@@ -54030,73 +54004,69 @@
     com.android.tools.r8.com.google.common.collect.BiMap reservationStates -> e
     java.util.Map namingStates -> f
     java.util.Map frontiers -> g
-    1:1:void <clinit>():87:87 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):135:135 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):122:141 -> <init>
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):134:134 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):121:140 -> <init>
     java.lang.Object lambda$getNamingKeyTransform$2(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> a
-    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):87:87 -> a
-    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):87:87 -> a
-    4:4:java.util.function.Function getNamingKeyTransform():156:156 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    5:5:java.util.function.Function getNamingKeyTransform():156 -> a
-    6:7:java.util.function.Function getNamingKeyTransform():157:158 -> a
-    8:8:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):181:181 -> a
-    9:11:void reserveNamesInClasses():239:241 -> a
-    9:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):182 -> a
-    12:12:void reserveNamesInClasses():239:239 -> a
-    12:12:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):182 -> a
-    13:29:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):183:199 -> a
-    30:36:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):203:209 -> a
+    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> a
+    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):86:86 -> a
+    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):86:86 -> a
+    4:4:java.util.function.Function getNamingKeyTransform():155:155 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> a
+    5:5:java.util.function.Function getNamingKeyTransform():155 -> a
+    6:7:java.util.function.Function getNamingKeyTransform():156:157 -> a
+    8:8:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):179:179 -> a
+    9:12:void reserveNamesInClasses():237:237 -> a
+    9:12:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):180 -> a
+    13:29:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):181:197 -> a
+    30:36:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):201:207 -> a
     37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    37:37:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):209 -> a
-    38:39:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):210:211 -> a
-    40:53:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):222:235 -> a
-    40:53:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):212 -> a
-    54:55:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):72:73 -> a
-    54:55:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):235 -> a
-    54:55:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):212 -> a
-    56:57:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):215:216 -> a
-    58:58:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):208:208 -> a
-    59:68:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):266:275 -> a
-    69:69:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    37:37:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):207 -> a
+    38:39:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):208:209 -> a
+    40:53:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):220:233 -> a
+    40:53:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):210 -> a
+    54:55:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):213:214 -> a
+    56:56:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):206:206 -> a
+    57:66:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):264:273 -> a
+    67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    67:67:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):273 -> a
+    68:68:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):275:275 -> a
+    69:69:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):320:320 -> a
     69:69:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):275 -> a
-    70:70:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):277:277 -> a
-    71:71:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):322:322 -> a
-    71:71:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):277 -> a
-    72:81:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):277:286 -> a
-    82:82:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):284:284 -> a
-    83:83:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):273:273 -> a
-    84:90:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):297:303 -> a
-    91:91:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    91:91:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):303 -> a
-    92:100:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):305:313 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> b
-    2:3:java.util.function.Function getReservationKeyTransform():145:146 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> b
-    4:4:java.util.function.Function getReservationKeyTransform():146 -> b
-    5:8:java.util.function.Function getReservationKeyTransform():148:151 -> b
-    9:9:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):148:148 -> b
-    10:18:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):247:255 -> b
+    70:79:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):275:284 -> a
+    80:80:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):282:282 -> a
+    81:81:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):271:271 -> a
+    82:88:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):295:301 -> a
+    89:89:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    89:89:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):301 -> a
+    90:98:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):303:311 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> b
+    2:3:java.util.function.Function getReservationKeyTransform():144:145 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> b
+    4:4:java.util.function.Function getReservationKeyTransform():145 -> b
+    5:8:java.util.function.Function getReservationKeyTransform():147:150 -> b
+    9:9:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):147:147 -> b
+    10:18:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):245:253 -> b
     19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
-    19:19:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):255 -> b
-    20:23:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):256:259 -> b
-    24:24:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):257:257 -> b
-    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> c
-    2:2:java.lang.Object lambda$getReservationKeyTransform$1(com.android.tools.r8.graph.DexMethod):151:151 -> c
-    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> d
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> e
+    19:19:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):253 -> b
+    20:23:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):254:257 -> b
+    24:24:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):255:255 -> b
+    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> c
+    2:2:java.lang.Object lambda$getReservationKeyTransform$1(com.android.tools.r8.graph.DexMethod):150:150 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> d
+    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> e
 com.android.tools.r8.naming.MethodNameMinifier$1 -> com.android.tools.r8.naming.w:
 com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.naming.x$a:
     java.util.Map renaming -> a
     java.util.Map callSiteRenaming -> b
-    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):161:161 -> <init>
-    2:4:void <init>(java.util.Map,java.util.Map):167:169 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():173:173 -> a
+    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):160:160 -> <init>
+    2:4:void <init>(java.util.Map,java.util.Map):166:168 -> <init>
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():172:172 -> a
 com.android.tools.r8.naming.MethodNameMinifier$State -> com.android.tools.r8.naming.y:
     com.android.tools.r8.naming.MethodNameMinifier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):91:91 -> <init>
-    1:1:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):98:98 -> a
+    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> <init>
+    1:1:void putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> a
+    2:2:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):97:97 -> a
 com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.naming.B:
     com.android.tools.r8.naming.MethodNamingState parentNamingState -> d
     boolean $assertionsDisabled -> f
@@ -54104,18 +54074,20 @@
     com.android.tools.r8.naming.MethodReservationState reservationState -> c
     1:1:void <clinit>():18:18 -> <clinit>
     1:4:void <init>(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.MethodReservationState):29:32 -> <init>
-    1:2:java.lang.Object com.android.tools.r8.naming.MethodNamingStateBase.getInternalState(com.android.tools.r8.graph.DexMethod):23:24 -> a
-    1:2:java.util.Set getUsedBy(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):92 -> a
-    3:9:java.util.Set getUsedBy(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):92:98 -> a
-    10:10:com.android.tools.r8.naming.MethodNamingState createRoot(java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.MethodReservationState):39:39 -> a
-    11:11:com.android.tools.r8.naming.MethodNamingState createChild(com.android.tools.r8.naming.MethodReservationState):43:43 -> a
-    12:27:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexMethod,java.util.function.BiPredicate):52:67 -> a
-    28:31:com.android.tools.r8.naming.MethodNamingState$InternalNewNameState createInternalState(com.android.tools.r8.graph.DexMethod):118:121 -> a
-    28:31:java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod):18 -> a
-    1:12:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):77:88 -> b
+    1:1:com.android.tools.r8.naming.MethodNamingState createRoot(java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.MethodReservationState):39:39 -> a
+    2:2:com.android.tools.r8.naming.MethodNamingState createChild(com.android.tools.r8.naming.MethodReservationState):43:43 -> a
+    3:16:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexMethod,java.util.function.BiPredicate):52:65 -> a
+    17:18:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):76:77 -> a
+    19:22:com.android.tools.r8.naming.MethodNamingState$InternalNewNameState createInternalState(com.android.tools.r8.graph.DexMethod):122:125 -> a
+    19:22:java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod):18 -> a
+    1:2:java.lang.Object com.android.tools.r8.naming.MethodNamingStateBase.getInternalState(com.android.tools.r8.graph.DexMethod):23:24 -> b
+    1:2:java.util.Set getUsedBy(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):96 -> b
+    3:9:java.util.Set getUsedBy(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):96:102 -> b
+    10:12:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexMethod,java.util.function.BiPredicate):69:71 -> b
     1:2:java.lang.Object com.android.tools.r8.naming.MethodNamingStateBase.getInternalState(com.android.tools.r8.graph.DexMethod):23:24 -> c
-    1:2:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):105 -> c
-    3:8:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):105:110 -> c
+    1:2:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):109 -> c
+    3:8:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):109:114 -> c
+    9:20:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):81:92 -> c
     1:1:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexMethod):48:48 -> d
 com.android.tools.r8.naming.MethodNamingState$1 -> com.android.tools.r8.naming.z:
 com.android.tools.r8.naming.MethodNamingState$InternalNewNameState -> com.android.tools.r8.naming.A:
@@ -54125,20 +54097,20 @@
     boolean $assertionsDisabled -> f
     int nameCount -> d
     int dictionaryIndex -> e
-    1:1:void <clinit>():124:124 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.MethodNamingState$InternalNewNameState,com.android.tools.r8.naming.MethodNamingState$1):124:124 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.MethodNamingState$InternalNewNameState):136:136 -> <init>
-    3:19:void <init>(com.android.tools.r8.naming.MethodNamingState$InternalNewNameState):127:143 -> <init>
-    1:1:int incrementDictionaryIndex():153:153 -> a
-    2:2:java.util.Set getUsedBy(com.android.tools.r8.graph.DexString):157:157 -> a
-    3:3:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):161:161 -> a
-    4:6:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):165:167 -> a
-    7:7:int incrementNameIndex(boolean):183:183 -> a
-    8:13:boolean checkParentPublicNameCountIsLessThanOrEqual():172:177 -> a
-    8:13:int incrementNameIndex(boolean):183 -> a
-    14:14:int incrementNameIndex(boolean):184:184 -> a
-    1:1:int getDictionaryIndex():148:148 -> b
-    2:2:java.util.Set lambda$addRenaming$0(com.android.tools.r8.graph.DexString):167:167 -> b
+    1:1:void <clinit>():128:128 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.MethodNamingState$InternalNewNameState,com.android.tools.r8.naming.MethodNamingState$1):128:128 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.MethodNamingState$InternalNewNameState):140:140 -> <init>
+    3:19:void <init>(com.android.tools.r8.naming.MethodNamingState$InternalNewNameState):131:147 -> <init>
+    1:1:int incrementDictionaryIndex():157:157 -> a
+    2:2:java.util.Set getUsedBy(com.android.tools.r8.graph.DexString):161:161 -> a
+    3:3:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):165:165 -> a
+    4:6:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):169:171 -> a
+    7:7:int incrementNameIndex(boolean):187:187 -> a
+    8:13:boolean checkParentPublicNameCountIsLessThanOrEqual():176:181 -> a
+    8:13:int incrementNameIndex(boolean):187 -> a
+    14:14:int incrementNameIndex(boolean):188:188 -> a
+    1:1:int getDictionaryIndex():152:152 -> b
+    2:2:java.util.Set lambda$addRenaming$0(com.android.tools.r8.graph.DexString):171:171 -> b
 com.android.tools.r8.naming.MethodNamingStateBase -> com.android.tools.r8.naming.C:
     java.util.Map internalStates -> a
     java.util.function.Function keyTransform -> b
@@ -54228,63 +54200,62 @@
     1:16:java.lang.String toString():190:205 -> toString
 com.android.tools.r8.naming.Minifier -> com.android.tools.r8.naming.H:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set desugaredCallSites -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):44:46 -> <init>
-    1:13:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):50:62 -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):42:43 -> <init>
+    1:13:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):47:59 -> a
     14:14:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming com.android.tools.r8.naming.ClassNameMinifier.computeRenaming(com.android.tools.r8.utils.Timing):95:95 -> a
-    14:14:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63 -> a
-    15:45:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):64:94 -> a
-    46:46:int lambda$run$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):52:52 -> a
+    14:14:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60 -> a
+    15:44:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61:90 -> a
+    45:45:int lambda$run$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):49:49 -> a
 com.android.tools.r8.naming.Minifier$BaseMinificationNamingStrategy -> com.android.tools.r8.naming.H$a:
     java.util.List obfuscationDictionary -> a
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing mixedCasing -> c
     java.util.Set obfuscationDictionaryForLookup -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():99:99 -> <clinit>
-    1:6:void <init>(java.util.List,boolean):107:112 -> <init>
-    1:11:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState,boolean):116:126 -> a
-    12:18:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState,boolean):125:131 -> a
+    1:1:void <clinit>():95:95 -> <clinit>
+    1:6:void <init>(java.util.List,boolean):103:108 -> <init>
+    1:11:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState,boolean):112:122 -> a
+    12:18:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState,boolean):121:127 -> a
 com.android.tools.r8.naming.Minifier$MinificationClassNamingStrategy -> com.android.tools.r8.naming.H$b:
     com.android.tools.r8.graph.DexItemFactory factory -> f
     com.android.tools.r8.graph.AppView appView -> e
-    1:2:void <init>(com.android.tools.r8.graph.AppView):143:144 -> <init>
-    3:7:void <init>(com.android.tools.r8.graph.AppView):142:146 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):139:140 -> <init>
+    3:7:void <init>(com.android.tools.r8.graph.AppView):138:142 -> <init>
     boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType) -> a
-    1:17:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):158:174 -> a
-    18:22:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):160:164 -> a
+    1:17:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):154:170 -> a
+    18:22:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):156:160 -> a
     23:23:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    23:23:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):164 -> a
-    24:24:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):164:164 -> a
-    1:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):180:181 -> b
+    23:23:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):160 -> a
+    24:24:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):160:160 -> a
+    1:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):176:177 -> b
 com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy -> com.android.tools.r8.naming.H$c:
-    1:2:void <init>(com.android.tools.r8.graph.AppView):197:198 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.AppView):196:196 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):193:194 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.AppView):192:192 -> <init>
 com.android.tools.r8.naming.Minifier$MinifierMemberNamingStrategy -> com.android.tools.r8.naming.H$d:
     com.android.tools.r8.graph.DexItemFactory factory -> f
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():215:215 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView):222:224 -> <init>
-    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):232:233 -> a
+    1:1:void <clinit>():211:211 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView):218:220 -> <init>
+    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):228:229 -> a
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> a
-    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):233 -> a
-    4:4:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):234:234 -> a
-    5:5:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):256:256 -> a
-    5:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):237 -> a
-    6:6:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):238:238 -> a
-    7:7:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):247:247 -> a
-    8:8:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):256:256 -> a
-    8:8:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):250 -> a
-    9:9:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):251:251 -> a
-    10:14:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):261:265 -> a
-    15:16:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):272:273 -> a
-    17:17:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):280:280 -> a
-    1:1:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):284:284 -> c
+    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):229 -> a
+    4:4:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):230:230 -> a
+    5:5:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):252:252 -> a
+    5:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):233 -> a
+    6:6:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):234:234 -> a
+    7:7:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):243:243 -> a
+    8:8:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):252:252 -> a
+    8:8:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):246 -> a
+    9:9:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):247:247 -> a
+    10:14:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):257:261 -> a
+    15:16:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):268:269 -> a
+    17:17:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):276:276 -> a
+    1:1:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):280:280 -> c
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> c
-    2:2:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):284 -> c
-    3:3:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):285:285 -> c
+    2:2:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):280 -> c
+    3:3:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):281:281 -> c
 com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.I:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():42:42 -> <clinit>
@@ -54299,24 +54270,18 @@
     java.lang.String lookupPackageName(java.lang.String) -> a
     boolean verifyNoOverlap(java.util.Map) -> a
     1:9:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):57:65 -> a
-    10:13:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:79 -> a
-    14:14:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
-    15:19:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:87 -> a
-    20:20:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:83 -> a
+    10:14:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
+    15:20:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:83 -> a
     21:21:com.android.tools.r8.graph.DexType lambda$lookupProto$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):86:86 -> a
     22:22:com.android.tools.r8.graph.DexType[] lambda$lookupProto$1(int):87:87 -> a
     23:31:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):91:99 -> a
     32:32:com.android.tools.r8.naming.NamingLens getIdentityLens():113:113 -> a
     33:43:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):140:150 -> a
-    44:47:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:72 -> a
-    44:47:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):150 -> a
-    48:48:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:69 -> a
-    48:48:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):150 -> a
+    44:48:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:69 -> a
+    44:48:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):150 -> a
     49:55:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):151:157 -> a
-    56:59:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:79 -> a
-    56:59:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):157 -> a
-    60:60:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
-    60:60:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):157 -> a
+    56:60:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
+    56:60:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):157 -> a
     61:63:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):158:160 -> a
     boolean hasPrefixRewritingLogic() -> b
     com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod) -> b
@@ -54362,7 +54327,7 @@
     30:31:java.lang.String lookupPackageName(java.lang.String):125 -> a
     32:32:java.lang.String lookupPackageName(java.lang.String):126:126 -> a
     33:33:void forAllRenamedTypes(java.util.function.Consumer):142:142 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():328:328 -> 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
@@ -54384,130 +54349,129 @@
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.SeedMapper seedMapper -> c
-    java.util.Set desugaredCallSites -> d
-    boolean $assertionsDisabled -> l
-    com.android.tools.r8.com.google.common.collect.BiMap mappedNames -> e
-    java.util.Set mappedClasses -> f
-    java.util.Map defaultInterfaceMethodImplementationNames -> i
-    java.util.Map additionalMethodNamings -> j
-    java.util.Map additionalFieldNamings -> k
-    java.util.Map memberNames -> g
-    java.util.Map syntheticCompanionClasses -> h
-    1:1:void <clinit>():66:66 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):85:85 -> <init>
-    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):72:89 -> <init>
-    1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):74:74 -> a
-    2:31:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):94:123 -> a
-    32:40:void computeDefaultInterfaceMethodMethods():328:336 -> a
-    32:40:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
+    boolean $assertionsDisabled -> k
+    com.android.tools.r8.com.google.common.collect.BiMap mappedNames -> d
+    java.util.Set mappedClasses -> e
+    java.util.Map additionalMethodNamings -> i
+    java.util.Map additionalFieldNamings -> j
+    java.util.Map memberNames -> f
+    java.util.Map syntheticCompanionClasses -> g
+    java.util.Map defaultInterfaceMethodImplementationNames -> h
+    1:1:void <clinit>():65:65 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):80:80 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):70:83 -> <init>
+    1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):72:72 -> a
+    2:31:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):88:117 -> a
+    32:40:void computeDefaultInterfaceMethodMethods():321:329 -> a
+    32:40:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118 -> a
     41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    41:41:void computeDefaultInterfaceMethodMethods():336 -> a
-    41:41:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
-    42:42:void computeDefaultInterfaceMethodMethods():338:338 -> a
-    42:42:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
-    43:47:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):354:358 -> a
-    43:47:void computeDefaultInterfaceMethodMethods():338 -> a
-    43:47:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
+    41:41:void computeDefaultInterfaceMethodMethods():329 -> a
+    41:41:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118 -> a
+    42:42:void computeDefaultInterfaceMethodMethods():331:331 -> a
+    42:42:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118 -> a
+    43:47:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):347:351 -> a
+    43:47:void computeDefaultInterfaceMethodMethods():331 -> a
+    43:47:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118 -> a
     48:48:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    48:48:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):358 -> a
-    48:48:void computeDefaultInterfaceMethodMethods():338 -> a
-    48:48:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
-    49:64:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):359:374 -> a
-    49:64:void computeDefaultInterfaceMethodMethods():338 -> a
-    49:64:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
-    65:69:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):373:377 -> a
-    65:69:void computeDefaultInterfaceMethodMethods():338 -> a
-    65:69:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
-    70:70:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):376:376 -> a
-    70:70:void computeDefaultInterfaceMethodMethods():338 -> a
-    70:70:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
-    71:117:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):125:171 -> a
-    118:118:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):115:115 -> a
-    119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    119:119:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):115 -> a
-    120:121:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):116:117 -> a
-    122:123:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):177:178 -> a
-    124:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    124:124:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):178 -> a
-    125:147:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):181:203 -> a
-    148:163:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):200:215 -> a
-    164:167:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):214:217 -> a
-    168:168:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> a
-    168:168:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):217 -> a
-    169:174:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):218:223 -> a
-    175:188:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):218:231 -> a
-    189:202:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):230:243 -> a
-    203:203:boolean com.android.tools.r8.graph.DexClass.isAbstract():626:626 -> a
-    203:203:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):243 -> a
-    204:217:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):244:257 -> a
-    218:218:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):252:252 -> a
-    219:225:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):263:269 -> a
-    226:226:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    226:226:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):269 -> a
-    227:227:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):271:271 -> a
-    228:228:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):267:267 -> a
-    229:234:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):281:286 -> a
-    235:237:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285:287 -> a
-    238:238:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> a
-    238:238:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):287 -> a
-    239:245:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):288:294 -> a
-    246:248:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):293:295 -> a
-    249:249:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):180:180 -> a
-    249:249:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):295 -> a
-    250:251:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):296:297 -> a
-    252:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):304:305 -> a
-    254:259:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):304:309 -> a
-    260:267:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):314:321 -> a
-    268:268:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):320:320 -> a
-    269:273:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):319:323 -> a
-    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):97:97 -> b
-    2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):196:196 -> b
-    3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):257:257 -> b
+    48:48:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):351 -> a
+    48:48:void computeDefaultInterfaceMethodMethods():331 -> a
+    48:48:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118 -> a
+    49:64:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):352:367 -> a
+    49:64:void computeDefaultInterfaceMethodMethods():331 -> a
+    49:64:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118 -> a
+    65:69:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366:370 -> a
+    65:69:void computeDefaultInterfaceMethodMethods():331 -> a
+    65:69:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118 -> a
+    70:70:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):369:369 -> a
+    70:70:void computeDefaultInterfaceMethodMethods():331 -> a
+    70:70:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118 -> a
+    71:116:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):119:164 -> a
+    117:117:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):109:109 -> a
+    118:118:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    118:118:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):109 -> a
+    119:120:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):110:111 -> a
+    121:122:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):170:171 -> a
+    123:123:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    123:123:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):171 -> a
+    124:146:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):174:196 -> a
+    147:162:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):193:208 -> a
+    163:166:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):207:210 -> a
+    167:167:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> a
+    167:167:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):210 -> a
+    168:174:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):211:211 -> a
+    182:187:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):219:224 -> a
+    188:201:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):223:236 -> a
+    202:202:boolean com.android.tools.r8.graph.DexClass.isAbstract():639:639 -> a
+    202:202:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):236 -> a
+    203:216:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):237:250 -> a
+    217:217:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):245:245 -> a
+    218:224:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):256:262 -> a
+    225:225:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    225:225:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):262 -> a
+    226:226:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):264:264 -> a
+    227:227:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):260:260 -> a
+    228:233:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):274:279 -> a
+    234:236:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):278:280 -> a
+    237:237:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> a
+    237:237:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):280 -> a
+    238:244:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):281:287 -> a
+    245:247:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):286:288 -> a
+    248:248:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):180:180 -> a
+    248:248:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):288 -> a
+    249:250:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):289:290 -> a
+    251:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):297:297 -> a
+    255:258:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):299:302 -> a
+    259:266:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):307:314 -> a
+    267:267:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):313:313 -> a
+    268:272:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):312:316 -> a
+    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):91:91 -> b
+    2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):189:189 -> b
+    3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):250:250 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.M:
     boolean $assertionsDisabled -> h
     java.util.Map mappings -> g
-    1:1:void <clinit>():382:382 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):387:388 -> <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):397:399 -> a
-    4:4:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):429:429 -> a
-    1:1:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):407:407 -> b
+    1:1:void <clinit>():375:375 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):380:381 -> <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):390:392 -> a
+    4:4:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):422:422 -> a
+    1:1:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):400:400 -> b
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
-    2:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):407 -> b
-    3:18:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):409:424 -> b
+    2:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):400 -> b
+    3:18:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):402:417 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.N:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexItemFactory factory -> i
     java.util.Map mappedNames -> h
-    1:1:void <clinit>():433:433 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):441:444 -> <init>
+    1:1:void <clinit>():426:426 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):434:437 -> <init>
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
-    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):452:452 -> a
+    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):445:445 -> a
     2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> a
-    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):452 -> a
-    3:13:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):453:463 -> a
+    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):445 -> 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):446:456 -> a
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    14:14:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):464 -> a
-    15:15:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):464:464 -> a
-    16:16:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):463:463 -> a
-    17:17:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):473:473 -> a
+    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):457 -> 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):457:457 -> 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):456:456 -> 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):466:466 -> a
     18:18:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):180:180 -> a
-    18:18:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):475 -> a
-    19:19:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):475:475 -> a
-    20:20:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):473:473 -> a
-    21:23:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):491:493 -> a
+    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):468 -> 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):468:468 -> 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):466:466 -> 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):484:486 -> a
     24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    24:24:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):493 -> a
-    25:29:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):494:498 -> a
-    30:36:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):547:553 -> a
-    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):498 -> a
-    37:37:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):550:550 -> 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):498 -> 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):502:504 -> a
-    41:41:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):509:509 -> a
-    42:42:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):514:514 -> 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):518:536 -> 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):461:461 -> 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):480:480 -> b
+    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):486 -> 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):487:491 -> a
+    30:36:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):540:546 -> 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):491 -> a
+    37:37:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):543:543 -> 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):491 -> 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):495:497 -> a
+    41:41:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):502:502 -> a
+    42:42:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):507:507 -> 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):511:529 -> 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):454:454 -> 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):473:473 -> b
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.Q:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
@@ -54788,8 +54752,7 @@
     16:18:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo getInstance(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):128:130 -> a
     19:27:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo getInstance(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):124:132 -> a
     28:28:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo getInstance(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):126:126 -> a
-    29:32:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.naming.NamingLens):155:158 -> a
-    33:33:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.naming.NamingLens):155:155 -> a
+    29:33:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.naming.NamingLens):155:155 -> a
     boolean isClassNameComputationInfo() -> c
     1:1:boolean needsToComputeName():144:144 -> e
     2:2:boolean com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping.needsToComputeClassName():30:30 -> e
@@ -54808,12 +54771,11 @@
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping CANONICAL_NAME -> d
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping[] $VALUES -> f
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping SIMPLE_NAME -> e
-    1:6:void <clinit>():22:27 -> <clinit>
-    7:7:void <clinit>():22:22 -> <clinit>
+    1:7:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:39:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):44:82 -> a
     40:49:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):68:77 -> a
-    50:51:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):286:287 -> a
+    50:51:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):296:297 -> a
     50:51:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):61 -> a
     52:52:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):63:63 -> a
     53:53:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):54:54 -> a
@@ -54910,16 +54872,16 @@
     28:29:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):73:74 -> a
     30:68:com.android.tools.r8.graph.DexAnnotationSet rewriteGenericSignatures(com.android.tools.r8.graph.DexAnnotationSet,java.util.function.Consumer,java.util.function.Supplier,java.util.function.BiConsumer):91:129 -> a
     69:74:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):134:139 -> a
-    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
     75:75:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):139 -> a
     76:89:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):139:152 -> a
-    90:90:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    90:90:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> a
     90:90:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):62 -> a
     91:91:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):62:62 -> a
-    92:92:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    92:92:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> a
     92:92:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):70 -> a
     93:93:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):70:70 -> a
-    94:94:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    94:94:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> a
     94:94:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):78 -> a
     95:95:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):78:78 -> a
     1:1:java.util.Map access$200(com.android.tools.r8.naming.signature.GenericSignatureRewriter):30:30 -> b
@@ -54962,19 +54924,19 @@
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> c
     com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder lenseBuilder -> d
     com.android.tools.r8.graph.AppView appView -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):37:37 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):34:40 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):57:57 -> a
-    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63:73 -> a
-    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):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 lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):82:82 -> a
-    46:90:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109:153 -> a
-    46:90:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):87 -> a
-    91:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):114:114 -> a
-    91:91:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):87 -> a
-    92:92:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):88:88 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):36:36 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):33:39 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):56:56 -> a
+    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:72 -> a
+    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):56 -> a
+    13:37:void publicizeType(com.android.tools.r8.graph.DexType):76:100 -> a
+    38:44:void publicizeType(com.android.tools.r8.graph.DexType):98:104 -> a
+    45:45:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):81:81 -> a
+    46:90:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):108:152 -> a
+    46:90:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):86 -> a
+    91:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):113:113 -> a
+    91:91:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):86 -> a
+    92:92:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
 com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.z.c:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> a
     com.android.tools.r8.graph.DexMethod target -> b
@@ -55041,7 +55003,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():345:345 -> a
+    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> 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
@@ -55265,8 +55227,8 @@
     3:73:void <init>(byte[],int,boolean):188:258 -> <init>
     74:106:void <init>(byte[],int,boolean):239:271 -> <init>
     107:107:void <init>(java.io.InputStream):283:283 -> <init>
-    1:11:byte[] readStream(java.io.InputStream,boolean):312:322 -> a
-    12:24:byte[] readStream(java.io.InputStream,boolean):312:324 -> a
+    1:12:byte[] readStream(java.io.InputStream,boolean):312:312 -> a
+    20:24:byte[] readStream(java.io.InputStream,boolean):320:324 -> a
     25:25:byte[] readStream(java.io.InputStream,boolean):310:310 -> a
     26:139:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):421:534 -> a
     140:146:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):533:539 -> a
@@ -55380,16 +55342,13 @@
     3890:3894:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2931:2935 -> a
     3895:3900:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2894:2899 -> a
     3901:3906:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2870:2875 -> a
-    3907:3909:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2828:2830 -> a
-    3910:3910:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2828:2828 -> a
-    3911:3912:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2822:2823 -> a
-    3913:3913:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2822:2822 -> a
+    3907:3910:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2828:2828 -> a
+    3911:3913:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2822:2822 -> a
     3914:3914:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2818:2818 -> a
     3915:3915:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2817:2817 -> a
-    3916:3917:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2809:2810 -> a
-    3918:3918:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2809:2809 -> a
-    3919:3920:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2804:2805 -> a
-    3921:3970:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2804:2853 -> a
+    3916:3918:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2809:2809 -> a
+    3919:3921:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2804:2804 -> a
+    3970:3970:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2853:2853 -> a
     3971:3971:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2852:2852 -> a
     3972:4004:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3145:3177 -> a
     4005:4005:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3173:3173 -> a
@@ -55787,58 +55746,57 @@
     9:10:void visitEnd():771:772 -> c
     1:2:void visitVarInsn(int,int):347:348 -> d
 com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.A.a.a.v:
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> I
+    boolean hasSubroutines -> d0
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> I
     int nameIndex -> l
-    boolean hasAsmInstructions -> f0
-    com.android.tools.r8.org.objectweb.asm.ByteVector defaultValue -> Q
     com.android.tools.r8.org.objectweb.asm.ByteVector code -> r
-    int visibleAnnotableParameterCount -> K
-    com.android.tools.r8.org.objectweb.asm.Label currentBasicBlock -> X
     com.android.tools.r8.org.objectweb.asm.ByteVector lineNumberTable -> v
+    int signatureIndex -> G
     com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTypeTable -> z
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeInvisibleParameterAnnotations -> M
+    int relativeStackSize -> X
     int localVariableTypeTableLength -> y
-    com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> T
+    int compute -> T
     int lineNumberTableLength -> u
     int maxLocals -> q
-    int previousFrameOffset -> b0
-    int sourceOffset -> h0
+    int invisibleAnnotableParameterCount -> L
+    int sourceLength -> h0
     java.lang.String name -> m
-    int signatureIndex -> H
-    com.android.tools.r8.org.objectweb.asm.Label lastBasicBlock -> W
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> J
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeVisibleParameterAnnotations -> L
-    int[] STACK_SIZE_DELTA -> j0
-    int relativeStackSize -> Y
-    int[] currentFrame -> d0
-    int compute -> U
+    com.android.tools.r8.org.objectweb.asm.Label currentBasicBlock -> W
+    int lastBytecodeOffset -> f0
+    com.android.tools.r8.org.objectweb.asm.ByteVector defaultValue -> P
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleTypeAnnotation -> N
+    int maxRelativeStackSize -> Y
+    com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> S
+    int parametersCount -> Q
+    int[] previousFrame -> b0
     int descriptorIndex -> n
-    boolean hasSubroutines -> e0
-    int invisibleAnnotableParameterCount -> M
+    boolean hasAsmInstructions -> e0
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeVisibleTypeAnnotation -> C
-    com.android.tools.r8.org.objectweb.asm.Label firstBasicBlock -> V
-    com.android.tools.r8.org.objectweb.asm.ByteVector parameters -> S
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleTypeAnnotation -> O
+    com.android.tools.r8.org.objectweb.asm.Label lastBasicBlock -> V
+    int numberOfExceptions -> E
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> O
     com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTable -> x
     int stackMapTableNumberOfEntries -> A
-    int[] exceptionIndexTable -> G
-    int maxRelativeStackSize -> Z
+    int currentLocals -> Z
     com.android.tools.r8.org.objectweb.asm.ByteVector stackMapTableEntries -> B
+    com.android.tools.r8.org.objectweb.asm.Label firstBasicBlock -> U
     int localVariableTableLength -> w
     com.android.tools.r8.org.objectweb.asm.Handler lastHandler -> t
-    int parametersCount -> R
-    int currentLocals -> a0
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeVisibleParameterAnnotations -> K
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> H
+    int previousFrameOffset -> a0
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeInvisibleTypeAnnotation -> D
+    int visibleAnnotableParameterCount -> J
     int accessFlags -> k
-    int lastBytecodeOffset -> g0
+    com.android.tools.r8.org.objectweb.asm.ByteVector parameters -> R
+    int sourceOffset -> g0
     java.lang.String descriptor -> o
-    com.android.tools.r8.org.objectweb.asm.Attribute firstCodeAttribute -> E
-    int numberOfExceptions -> F
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> P
-    int sourceLength -> i0
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> j
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeInvisibleParameterAnnotations -> N
+    int[] exceptionIndexTable -> F
     com.android.tools.r8.org.objectweb.asm.Handler firstHandler -> s
-    int[] previousFrame -> c0
+    int[] STACK_SIZE_DELTA -> i0
+    int[] currentFrame -> c0
     int maxStack -> p
     1:1:void <clinit>():81:81 -> <clinit>
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):595:595 -> <init>
@@ -55935,8 +55893,8 @@
     87:87:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableLength(com.android.tools.r8.org.objectweb.asm.Handler):163:163 -> d
     87:87:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableSize(com.android.tools.r8.org.objectweb.asm.Handler):176 -> d
     87:87:int computeMethodInfoSize():2089 -> d
-    88:121:int computeMethodInfoSize():2090:2123 -> d
-    122:205:int computeMethodInfoSize():2083:2166 -> d
+    88:116:int computeMethodInfoSize():2090:2118 -> d
+    117:200:int computeMethodInfoSize():2083:2166 -> d
     1:10:void endCurrentBasicBlockWithNoSuccessor():1791:1800 -> e
     11:11:void putAbstractTypes(int,int):1956:1956 -> e
     12:15:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1422:1425 -> e
@@ -56518,8 +56476,7 @@
     13:15:void visitAnnotableParameterCount(int,boolean):296:298 -> a
     16:34:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):306:324 -> a
     35:38:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):331:334 -> a
-    39:45:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):349:355 -> a
-    46:46:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):349:349 -> a
+    39:46:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):349:349 -> a
     47:47:void visitInsn(int):360:360 -> a
     48:48:void visitTypeInsn(int,java.lang.String):375:375 -> a
     49:49:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):381:381 -> a
@@ -56557,19 +56514,17 @@
     205:212:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):89:96 -> a
     205:212:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):779 -> a
     213:213:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780:780 -> a
-    214:215:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:108 -> a
-    214:215:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    216:222:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:113 -> a
-    216:222:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
+    214:216:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:107 -> a
+    214:216:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
+    218:222:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):109:113 -> a
+    218:222:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
     223:232:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:121 -> a
     223:232:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
     233:233:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):120:120 -> a
     233:233:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
     234:238:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):784:788 -> a
-    239:240:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:90 -> a
-    239:240:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):788 -> a
-    241:241:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
-    241:241:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):788 -> a
+    239:241:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
+    239:241:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):788 -> a
     242:255:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):792:805 -> a
     void visitCode() -> b
     1:4:void visitParameter(java.lang.String,int):239:242 -> b
@@ -56777,8 +56732,8 @@
     1:8:boolean equals(java.lang.Object):68:75 -> equals
     1:1:java.util.List getFormalTypes():53:53 -> getFormalTypes
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():45:45 -> getHolderClass
-    1:2:java.lang.String getMethodDescriptor():84:85 -> getMethodDescriptor
-    3:5:java.lang.String getMethodDescriptor():84:86 -> getMethodDescriptor
+    1:3:java.lang.String getMethodDescriptor():84:84 -> getMethodDescriptor
+    5:5:java.lang.String getMethodDescriptor():86:86 -> getMethodDescriptor
     1:1:java.lang.String getMethodName():49:49 -> getMethodName
     1:1:com.android.tools.r8.references.TypeReference getReturnType():57:57 -> getReturnType
     1:1:int hashCode():80:80 -> hashCode
@@ -56880,8 +56835,8 @@
     1:5:void <clinit>():34:38 -> <clinit>
     1:1:void <init>():35:35 -> <init>
     1:7:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):95:101 -> a
-    8:9:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):97:98 -> a
-    10:12:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):97:99 -> a
+    8:10:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):97:97 -> a
+    12:12:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):99:99 -> a
     13:13:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path):101:101 -> a
     14:14:void lambda$run$1(java.util.List):159:159 -> a
     15:15:void lambda$main$2(java.lang.String[]):169:169 -> a
@@ -56903,10 +56858,10 @@
     62:63:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):109:110 -> run
     62:63:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):72 -> run
     62:63:void run(java.lang.String[]):151 -> run
-    64:66:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):76:78 -> run
-    64:66:void run(java.lang.String[]):151 -> run
-    67:71:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):76:80 -> run
-    67:71:void run(java.lang.String[]):151 -> run
+    64:67:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):76:76 -> run
+    64:67:void run(java.lang.String[]):151 -> run
+    70:71:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):79:80 -> run
+    70:71:void run(java.lang.String[]):151 -> run
     72:75:java.util.List getStackTraceFromStandardInput():173:176 -> run
     72:75:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):88 -> run
     72:75:void run(java.lang.String[]):151 -> run
@@ -56942,8 +56897,7 @@
     1:2:void <init>(com.android.tools.r8.naming.ClassNameMapper):24:25 -> <init>
     1:1:com.android.tools.r8.retrace.RetraceBase create(com.android.tools.r8.naming.ClassNameMapper):29:29 -> a
     2:2:com.android.tools.r8.retrace.RetraceMethodResult retrace(com.android.tools.r8.references.MethodReference):34:34 -> a
-    3:4:com.android.tools.r8.retrace.RetraceClassResult retrace(com.android.tools.r8.references.ClassReference):44:45 -> a
-    5:5:com.android.tools.r8.retrace.RetraceClassResult retrace(com.android.tools.r8.references.ClassReference):44:44 -> a
+    3:5:com.android.tools.r8.retrace.RetraceClassResult retrace(com.android.tools.r8.references.ClassReference):44:44 -> a
     6:6:com.android.tools.r8.retrace.RetraceTypeResult retrace(com.android.tools.r8.references.TypeReference):58:58 -> a
     7:19:java.lang.String retraceSourceFile(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.references.ClassReference,boolean):69:81 -> a
     20:22:java.lang.String com.android.tools.r8.com.google.common.io.Files.getFileExtension(java.lang.String):792:794 -> a
@@ -56969,8 +56923,7 @@
     2:2:com.android.tools.r8.retrace.RetraceClassResult forEach(java.util.function.Consumer):94:94 -> forEach
     1:1:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):37:37 -> lookupField
     1:1:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):50:50 -> lookupMethod
-    1:4:java.util.stream.Stream stream():85:88 -> stream
-    5:5:java.util.stream.Stream stream():85:85 -> stream
+    1:5:java.util.stream.Stream stream():85:85 -> stream
 com.android.tools.r8.retrace.RetraceClassResult$Element -> com.android.tools.r8.retrace.RetraceClassResult$a:
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
     com.android.tools.r8.references.ClassReference classReference -> b
@@ -56978,8 +56931,7 @@
     1:4:void <init>(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper):111:114 -> <init>
     1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$100(com.android.tools.r8.retrace.RetraceClassResult$Element):102:102 -> a
     2:2:com.android.tools.r8.references.ClassReference getClassReference():118:118 -> a
-    3:4:java.lang.String retraceSourceFile(java.lang.String,com.android.tools.r8.retrace.RetraceBase):126:127 -> a
-    5:5:java.lang.String retraceSourceFile(java.lang.String,com.android.tools.r8.retrace.RetraceBase):126:126 -> a
+    3:5:java.lang.String retraceSourceFile(java.lang.String,com.android.tools.r8.retrace.RetraceBase):126:126 -> a
     6:6:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):131:131 -> a
     7:7:java.lang.Object lookup(java.lang.String,java.util.function.BiFunction,com.android.tools.r8.retrace.RetraceClassResult$ResultConstructor):161:161 -> a
     7:7:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):131 -> a
@@ -57050,8 +57002,8 @@
     2:2:com.android.tools.r8.retrace.RetraceFieldResult forEach(java.util.function.Consumer):87:87 -> forEach
     1:1:boolean hasRetraceResult():40:40 -> stream
     1:1:java.util.stream.Stream stream():53 -> stream
-    2:6:java.util.stream.Stream stream():54:58 -> stream
-    7:15:java.util.stream.Stream stream():54:62 -> stream
+    2:7:java.util.stream.Stream stream():54:54 -> stream
+    13:15:java.util.stream.Stream stream():60:62 -> stream
 com.android.tools.r8.retrace.RetraceFieldResult$1 -> com.android.tools.r8.retrace.RetraceFieldResult$a:
 com.android.tools.r8.retrace.RetraceFieldResult$Element -> com.android.tools.r8.retrace.RetraceFieldResult$b:
     com.android.tools.r8.references.FieldReference fieldReference -> a
@@ -57097,7 +57049,7 @@
     2:6:void <init>(com.android.tools.r8.retrace.RetraceMethodResult,com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):142:146 -> <init>
     1:4:boolean containsMinifiedLineNumber(int):166:169 -> a
     5:8:int getFirstLineNumberOfOriginalRange():178:181 -> a
-    9:14:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():423:428 -> a
+    9:14:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():441:446 -> a
     9:14:int getFirstLineNumberOfOriginalRange():181 -> a
     1:1:com.android.tools.r8.references.MethodReference getMethodReference():150:150 -> b
     2:2:int getOriginalLineNumber(int):162:162 -> b
@@ -57325,7 +57277,7 @@
     1:1:java.lang.String getClassName(com.android.tools.r8.references.ClassReference):444:444 -> a
     java.lang.String subExpression() -> b
     1:1:com.android.tools.r8.references.ClassReference classFromMatch(java.lang.String):449:449 -> b
-com.android.tools.r8.retrace.RetraceStackTrace -> com.android.tools.r8.retrace.C:
+com.android.tools.r8.retrace.RetraceStackTrace -> com.android.tools.r8.retrace.D:
     java.util.List stackTrace -> b
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
     com.android.tools.r8.retrace.RetraceBase retraceBase -> a
@@ -57333,21 +57285,24 @@
     1:5:void <init>(com.android.tools.r8.retrace.RetraceBase,java.util.List,com.android.tools.r8.DiagnosticsHandler,boolean):98:102 -> <init>
     1:7:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():106:112 -> a
     8:11:void retraceLine(java.util.List,int,java.util.List):116:119 -> a
-    12:12:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):485:485 -> a
+    12:12:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):548:548 -> a
     12:12:void retraceLine(java.util.List,int,java.util.List):119 -> a
     13:33:com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine.tryParse(java.lang.String):204:224 -> a
-    13:33:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):489 -> a
+    13:33:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):552 -> a
     13:33:void retraceLine(java.util.List,int,java.util.List):119 -> a
-    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine com.android.tools.r8.retrace.RetraceStackTrace$MoreLine.tryParse(java.lang.String):434:444 -> a
-    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):493 -> a
-    34:44:void retraceLine(java.util.List,int,java.util.List):119 -> a
-    45:46:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):495:496 -> a
-    45:46:void retraceLine(java.util.List,int,java.util.List):119 -> a
-    47:50:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):495:498 -> a
-    47:50:void retraceLine(java.util.List,int,java.util.List):119 -> a
-    51:54:void retraceLine(java.util.List,int,java.util.List):120:123 -> a
-    55:56:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):481:482 -> a
-    55:56:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    34:56:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine com.android.tools.r8.retrace.RetraceStackTrace$CircularReferenceLine.tryParse(java.lang.String):478:500 -> a
+    34:56:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):556 -> a
+    34:56:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    57:67:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine com.android.tools.r8.retrace.RetraceStackTrace$MoreLine.tryParse(java.lang.String):434:444 -> a
+    57:67:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):560 -> a
+    57:67:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    68:70:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):562:562 -> a
+    68:70:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    73:73:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):565:565 -> a
+    73:73:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    74:77:void retraceLine(java.util.List,int,java.util.List):120:123 -> a
+    78:79:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):544:545 -> a
+    78:79:void retraceLine(java.util.List,int,java.util.List):119 -> a
 com.android.tools.r8.retrace.RetraceStackTrace$AtLine -> com.android.tools.r8.retrace.v:
     java.lang.String fileName -> f
     int linePosition -> g
@@ -57390,22 +57345,29 @@
     15:15:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):78:78 -> a
     16:16:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):76:76 -> a
     17:27:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):74:84 -> a
-com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine -> com.android.tools.r8.retrace.x:
+com.android.tools.r8.retrace.RetraceStackTrace$CircularReferenceLine -> com.android.tools.r8.retrace.x:
+    java.lang.String startWhitespace -> a
+    java.lang.String endBracketAndWhitespace -> c
+    java.lang.String exceptionClass -> b
+    1:4:void <init>(java.lang.String,java.lang.String,java.lang.String):470:473 -> <init>
+    1:4:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean):505:508 -> a
+    5:9:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):510:510 -> a
+    1:1:java.lang.String toString():520:520 -> toString
+com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine -> com.android.tools.r8.retrace.y:
     java.lang.String initialWhiteSpace -> a
     java.lang.String exceptionClass -> c
     java.lang.String description -> b
     java.lang.String message -> d
     1:5:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String):196:200 -> <init>
     1:4:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean):229:232 -> a
-    5:9:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):234:238 -> a
-    10:10:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):234:234 -> a
+    5:10:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):234:234 -> a
     1:1:java.lang.String toString():245:245 -> toString
-com.android.tools.r8.retrace.RetraceStackTrace$MoreLine -> com.android.tools.r8.retrace.y:
+com.android.tools.r8.retrace.RetraceStackTrace$MoreLine -> com.android.tools.r8.retrace.z:
     java.lang.String line -> a
     1:2:void <init>(java.lang.String):427:428 -> <init>
     1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean):452:452 -> a
     1:1:java.lang.String toString():457:457 -> toString
-com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine -> com.android.tools.r8.retrace.z:
+com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine -> com.android.tools.r8.retrace.A:
     1:1:void <init>():126:126 -> <init>
     com.android.tools.r8.retrace.RetraceStackTrace$AtLine asAtLine() -> a
     java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean) -> a
@@ -57414,7 +57376,7 @@
     3:3:boolean lambda$firstCharFromIndex$0(char,java.lang.Character):135:135 -> a
     4:9:int firstFromIndex(java.lang.String,int,java.util.function.Predicate):139:144 -> a
     boolean isAtLine() -> b
-com.android.tools.r8.retrace.RetraceStackTrace$StackTraceNode -> com.android.tools.r8.retrace.A:
+com.android.tools.r8.retrace.RetraceStackTrace$StackTraceNode -> com.android.tools.r8.retrace.B:
     java.util.List lines -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -57423,12 +57385,12 @@
     10:25:void append(java.util.List):41:56 -> a
     26:31:void append(java.util.List):53:58 -> a
     32:32:boolean lambda$append$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine):42:42 -> a
-com.android.tools.r8.retrace.RetraceStackTrace$UnknownLine -> com.android.tools.r8.retrace.B:
+com.android.tools.r8.retrace.RetraceStackTrace$UnknownLine -> com.android.tools.r8.retrace.C:
     java.lang.String line -> a
-    1:2:void <init>(java.lang.String):464:465 -> <init>
-    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean):470:470 -> a
-    1:1:java.lang.String toString():475:475 -> toString
-com.android.tools.r8.retrace.RetraceTypeResult -> com.android.tools.r8.retrace.E:
+    1:2:void <init>(java.lang.String):527:528 -> <init>
+    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean):533:533 -> a
+    1:1:java.lang.String toString():538:538 -> toString
+com.android.tools.r8.retrace.RetraceTypeResult -> com.android.tools.r8.retrace.F:
     com.android.tools.r8.retrace.RetraceBase retraceBase -> b
     com.android.tools.r8.references.TypeReference obfuscatedType -> a
     1:3:void <init>(com.android.tools.r8.references.TypeReference,com.android.tools.r8.retrace.RetraceBase):18:20 -> <init>
@@ -57438,7 +57400,7 @@
     1:1:com.android.tools.r8.retrace.Result forEach(java.util.function.Consumer):13 -> forEach
     1:10:java.util.stream.Stream stream():26:35 -> stream
     11:11:java.util.stream.Stream stream():27:27 -> stream
-com.android.tools.r8.retrace.RetraceTypeResult$Element -> com.android.tools.r8.retrace.D:
+com.android.tools.r8.retrace.RetraceTypeResult$Element -> com.android.tools.r8.retrace.E:
     com.android.tools.r8.references.TypeReference typeReference -> a
     1:2:void <init>(com.android.tools.r8.references.TypeReference):48:49 -> <init>
     1:1:com.android.tools.r8.references.TypeReference getTypeReference():53:53 -> a
@@ -57492,8 +57454,7 @@
     1:8:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):262:269 -> rewriteEncodedAnnotation
     9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> rewriteEncodedAnnotation
     9:9:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):269 -> rewriteEncodedAnnotation
-    10:11:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):270:271 -> rewriteEncodedAnnotation
-    12:12:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):270:270 -> rewriteEncodedAnnotation
+    10:12:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):270:270 -> rewriteEncodedAnnotation
     1:6:void run():231:236 -> run
     1:11:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):53:63 -> shouldKeepAnnotation
     12:12:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):137:137 -> shouldKeepAnnotation
@@ -57525,89 +57486,88 @@
     46:55:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):324:333 -> stripAttributes
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.AppInfoWithLiveness:
     1:1:void <clinit>():58:58 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.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,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):221:221 -> <init>
-    2:185:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:258 -> <init>
-    186:186:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):300:300 -> <init>
-    187:449:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:337 -> <init>
-    450:489:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):341:380 -> <init>
-    490:528:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):388:426 -> <init>
-    529:573:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):388:432 -> <init>
-    574:574:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):437:437 -> <init>
-    575:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):75:485 -> <init>
-    986:1004:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):481:499 -> <init>
-    1005:1021:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):495:511 -> <init>
-    1022:1029:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):507:514 -> <init>
-    1030:1030:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):521:521 -> <init>
-    1031:1515:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):75:559 -> <init>
-    1:8:void lambda$withStaticFieldWrites$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField,java.util.Set):639:646 -> a
-    9:14:void lambda$withoutStaticFieldsWrites$1(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):660:665 -> a
-    15:15:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):830:830 -> a
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1328:1330 -> addEnumValueInfoMaps
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1321:1323 -> addSwitchMaps
-    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):694:705 -> assertNoItemRemoved
-    1:15:boolean canVirtualMethodBeImplementedInExtraSubclass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):878:892 -> canVirtualMethodBeImplementedInExtraSubclass
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):583:615 -> computeReachableInterfaces
-    1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):673:675 -> filter
-    4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):673:673 -> filter
-    1:44:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1129:1172 -> findSingleTargetFromSubtypes
-    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):679:680 -> getEnumValueInfoMapFor
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():690:690 -> getFieldAccessInfoCollection
-    1:2:java.util.Set getPinnedItems():921:922 -> getPinnedItems
-    1:2:java.util.Set getPrunedTypes():953:954 -> getPrunedTypes
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):684:685 -> getSwitchMapFor
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexProgramClass):839:840 -> hasAnyInstantiatedLambdas
-    1:1:boolean hasLiveness():845:845 -> hasLiveness
-    1:5:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):861:865 -> hasPinnedInstanceInitializer
-    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1188:1197 -> interfacesMayHaveDefaultFor
-    1:7:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):784:790 -> isFieldOnlyWrittenInMethod
-    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):746:756 -> isFieldRead
-    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):760:761 -> isFieldWritten
-    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):765:776 -> isFieldWrittenByFieldPutInstruction
-    1:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):711:715 -> isInstantiatedDirectly
-    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):741:742 -> isInstantiatedDirectlyOrIndirectly
-    1:19:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):719:737 -> isInstantiatedIndirectly
-    1:4:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):999:1002 -> isInvalidSingleVirtualTarget
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):809:810 -> isLibraryOrClasspathField
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):563:563 -> isLiveProgramClass
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):567:568 -> isLiveProgramType
-    1:1:boolean isLockCandidate(com.android.tools.r8.graph.DexType):627:627 -> isLockCandidate
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):572:579 -> isNonProgramTypeOrLiveProgramType
-    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):856:857 -> isPinned
-    1:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):796:800 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):227:227 -> <init>
+    2:193:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:266 -> <init>
+    194:194:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):310:310 -> <init>
+    195: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.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:349 -> <init>
+    470:511:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):353:394 -> <init>
+    512:553:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):402:402 -> <init>
+    598:599:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):447:448 -> <init>
+    600:600:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):453:453 -> <init>
+    601:1027:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):75:501 -> <init>
+    1028:1048:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):497:517 -> <init>
+    1049:1065:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):513:529 -> <init>
+    1066:1073:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):525:532 -> <init>
+    1074:1074:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):539:539 -> <init>
+    1075:1579:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):75:579 -> <init>
+    1:8:void lambda$withStaticFieldWrites$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField,java.util.Set):653:660 -> a
+    9:14:void lambda$withoutStaticFieldsWrites$1(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):674:679 -> a
+    15:15:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):844:844 -> a
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1342:1344 -> addEnumValueInfoMaps
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1335:1337 -> addSwitchMaps
+    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):708:719 -> assertNoItemRemoved
+    1:15:boolean canVirtualMethodBeImplementedInExtraSubclass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):892:906 -> canVirtualMethodBeImplementedInExtraSubclass
+    1:27:java.util.Collection computeReachableInterfaces():603:629 -> computeReachableInterfaces
+    1:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):687:687 -> filter
+    1:44:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1143:1186 -> findSingleTargetFromSubtypes
+    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):693:694 -> getEnumValueInfoMapFor
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():704:704 -> getFieldAccessInfoCollection
+    1:2:java.util.Set getPinnedItems():935:936 -> getPinnedItems
+    1:2:java.util.Set getPrunedTypes():967:968 -> getPrunedTypes
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):698:699 -> getSwitchMapFor
+    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexProgramClass):853:854 -> hasAnyInstantiatedLambdas
+    1:1:boolean hasLiveness():859:859 -> hasLiveness
+    1:5:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):875:879 -> hasPinnedInstanceInitializer
+    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1202:1211 -> interfacesMayHaveDefaultFor
+    1:7:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):798:804 -> isFieldOnlyWrittenInMethod
+    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):760:770 -> isFieldRead
+    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):774:775 -> isFieldWritten
+    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):779:790 -> isFieldWrittenByFieldPutInstruction
+    1:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):725:729 -> isInstantiatedDirectly
+    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):755:756 -> isInstantiatedDirectlyOrIndirectly
+    1:19:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):733:751 -> isInstantiatedIndirectly
+    1:4:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1013:1016 -> isInvalidSingleVirtualTarget
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):823:824 -> isLibraryOrClasspathField
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):583:583 -> isLiveProgramClass
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):587:588 -> isLiveProgramType
+    1:1:boolean isLockCandidate(com.android.tools.r8.graph.DexType):641:641 -> isLockCandidate
+    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):592:599 -> isNonProgramTypeOrLiveProgramType
+    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):870:871 -> isPinned
+    1:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):810:814 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> isVirtualMethodPinnedDirectlyOrInAncestor
-    1:2:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):901 -> isVirtualMethodPinnedDirectlyOrInAncestor
-    3:14:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):902:913 -> isVirtualMethodPinnedDirectlyOrInAncestor
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1205:1206 -> lookupSingleInterfaceTarget
-    3:19: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):1214:1230 -> lookupSingleInterfaceTarget
-    20:72: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):1229:1281 -> lookupSingleInterfaceTarget
+    1:2:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):915 -> isVirtualMethodPinnedDirectlyOrInAncestor
+    3:14:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):916:927 -> isVirtualMethodPinnedDirectlyOrInAncestor
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1219:1220 -> lookupSingleInterfaceTarget
+    3:19: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):1228:1244 -> lookupSingleInterfaceTarget
+    20:72:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1243:1295 -> lookupSingleInterfaceTarget
     73:73:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> lookupSingleInterfaceTarget
-    73:73:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1281 -> lookupSingleInterfaceTarget
-    74:109: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):1282:1317 -> lookupSingleInterfaceTarget
-    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):959:974 -> lookupSingleTarget
-    17:17:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):972:972 -> lookupSingleTarget
-    18:18:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):970:970 -> lookupSingleTarget
-    19:19:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):968:968 -> lookupSingleTarget
-    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):966:966 -> lookupSingleTarget
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1007:1008 -> lookupSingleVirtualTarget
-    3:34:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1016:1047 -> lookupSingleVirtualTarget
-    35:91: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):1046:1102 -> lookupSingleVirtualTarget
-    92:98:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1098:1104 -> lookupSingleVirtualTarget
-    99:108:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1097:1106 -> lookupSingleVirtualTarget
-    109:109:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1084:1084 -> lookupSingleVirtualTarget
-    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):804:805 -> mayPropagateValueFor
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):933:934 -> prunedCopyFrom
-    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):815:819 -> rewriteItems
-    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):825:834 -> rewriteKeysConservativelyWhileMergingValues
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):939:940 -> rewrittenWithLense
-    1:9:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):982:990 -> validateSingleVirtualTarget
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):948:949 -> wasPruned
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():851:851 -> withLiveness
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withStaticFieldWrites(java.util.Map):632:637 -> withStaticFieldWrites
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):653:658 -> withoutStaticFieldsWrites
+    73:73:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1295 -> lookupSingleInterfaceTarget
+    74:109:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1296:1331 -> lookupSingleInterfaceTarget
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):973:988 -> 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):986:986 -> 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):984:984 -> 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):982:982 -> 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):980:980 -> lookupSingleTarget
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1021:1022 -> lookupSingleVirtualTarget
+    3:34: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):1030:1061 -> lookupSingleVirtualTarget
+    35:91: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):1060:1116 -> lookupSingleVirtualTarget
+    92:98: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):1112:1118 -> lookupSingleVirtualTarget
+    99:108:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1111:1120 -> lookupSingleVirtualTarget
+    109:109:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1098:1098 -> lookupSingleVirtualTarget
+    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):818:819 -> mayPropagateValueFor
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):947:948 -> prunedCopyFrom
+    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):829:833 -> rewriteItems
+    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):839:848 -> rewriteKeysConservativelyWhileMergingValues
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):953:954 -> rewrittenWithLense
+    1:9:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):996:1004 -> validateSingleVirtualTarget
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):962:963 -> wasPruned
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():865:865 -> withLiveness
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withStaticFieldWrites(java.util.Map):646:651 -> withStaticFieldWrites
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):667:672 -> withoutStaticFieldsWrites
 com.android.tools.r8.shaking.AppInfoWithLiveness$1 -> com.android.tools.r8.shaking.AppInfoWithLiveness$1:
-    1:1:void <clinit>():964:964 -> <clinit>
+    1:1:void <clinit>():978:978 -> <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):173:175 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):177:179 -> <init>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.ClassInlineRule:
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):73:87 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Builder builder():91:91 -> builder
@@ -57709,448 +57669,446 @@
     1:3:void checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> checkItem
     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>():112:112 -> <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:2332:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):140:2470 -> <init>
-    2333:2360:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):304:331 -> <init>
+    1:1:void <clinit>():129:129 -> <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):328:328 -> <init>
+    2:2461:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):157:2616 -> <init>
+    2462:2491:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):329:358 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$28(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1827 -> a
-    void lambda$newSetWithoutReasonReporter$2(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
-    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):345:345 -> a
-    3:8:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):391:396 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):180:180 -> a
-    9:9:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):396 -> a
-    10:16:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):398:404 -> a
-    17:17:java.util.Set lambda$registerMethodWithTargetAndContext$4(com.android.tools.r8.graph.DexMethod):539:539 -> a
-    18:18:void lambda$traceInvokeDirect$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):750:750 -> a
-    19:19:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):767:767 -> a
-    20:20:boolean lambda$registerDeferredActionForDeadProtoBuilder$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):768:768 -> a
-    21:21:void lambda$traceNewInstance$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):908:908 -> a
-    22:22:java.lang.Boolean lambda$traceStaticFieldRead$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1034:1034 -> a
-    23:23:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$11(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1099:1099 -> a
-    24:24:boolean lambda$markTypeAsLive$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1239:1239 -> a
-    25:25:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$18(com.android.tools.r8.graph.DexType):1251:1251 -> a
-    26:26:void lambda$processNewlyInstantiatedClass$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1511:1511 -> a
-    27:27:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$29(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1938:1938 -> a
-    28:28:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$31(com.android.tools.r8.graph.DexProgramClass):1959:1959 -> a
-    29:32:void lambda$markFailedResolutionTargets$33(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2134:2137 -> a
-    33:33:java.util.Set lambda$markSuperMethodAsReachable$34(com.android.tools.r8.graph.DexEncodedMethod):2195:2195 -> a
-    34:34:void lambda$createAppInfo$35(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2258:2258 -> a
-    35:35:boolean lambda$createAppInfo$36(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2263:2263 -> a
-    36:36:java.util.Set lambda$trace$37(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2368:2368 -> a
-    37:37:void lambda$trace$38(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2401:2401 -> a
-    38:38:void lambda$addConsequentRootSet$39(com.android.tools.r8.graph.DexReference,java.util.Map):2447:2447 -> a
-    39:39:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2452:2452 -> a
-    40:40:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    40:40:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2452 -> a
-    41:41:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2453:2453 -> a
-    42:42:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    42:42:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2453 -> a
-    43:43:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2454:2454 -> a
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    44:44:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2453 -> a
-    45:45:void lambda$markMethodAsLive$41(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2629:2629 -> a
-    46:46:void lambda$markMethodAsLive$42(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2636:2636 -> a
-    1:1:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):112:112 -> access$1000
-    1:1:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):112:112 -> access$1100
-    1:1:void access$1200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):112:112 -> access$1200
-    1:1:void access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):112:112 -> access$1300
-    1:1:void access$500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):112:112 -> access$500
-    1:1:com.android.tools.r8.graph.AppView access$600(com.android.tools.r8.shaking.Enqueuer):112:112 -> access$600
-    1:1:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):112:112 -> access$700
-    1:1:com.android.tools.r8.utils.InternalOptions access$800(com.android.tools.r8.shaking.Enqueuer):112:112 -> access$800
-    1:1:com.android.tools.r8.graph.DexProgramClass access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):112:112 -> access$900
-    1:8:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):2443:2450 -> addConsequentRootSet
+    1:1:void lambda$markInstanceFieldAsLive$28(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1849 -> a
+    void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
+    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):372:372 -> a
+    3:3:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):539:539 -> a
+    4:4:void lambda$traceInvokeDirect$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):772:772 -> a
+    5:5:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):789:789 -> a
+    6:6:boolean lambda$registerDeferredActionForDeadProtoBuilder$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):790:790 -> a
+    7:7:void lambda$traceNewInstance$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):930:930 -> a
+    8:8:java.lang.Boolean lambda$traceStaticFieldRead$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1056:1056 -> a
+    9:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$11(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1121:1121 -> a
+    10:10:boolean lambda$markTypeAsLive$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1261:1261 -> a
+    11:11:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$18(com.android.tools.r8.graph.DexType):1273:1273 -> a
+    12:12:void lambda$processNewlyInstantiatedClass$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1533:1533 -> a
+    13:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$29(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1964:1964 -> a
+    14:14:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$31(com.android.tools.r8.graph.DexProgramClass):1985:1985 -> a
+    15:18:void lambda$markFailedResolutionTargets$33(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2158:2161 -> a
+    19:19:java.util.Set lambda$markSuperMethodAsReachable$34(com.android.tools.r8.graph.DexEncodedMethod):2219:2219 -> a
+    20:20:void lambda$createAppInfo$35(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2298:2298 -> a
+    21:21:boolean lambda$createAppInfo$36(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2303:2303 -> a
+    22:23:void lambda$postProcessLambdaDesugaring$37(com.android.tools.r8.graph.DexEncodedField,java.util.Set):2387:2388 -> a
+    24:24:java.util.Set lambda$trace$38(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2514:2514 -> a
+    25:25:void lambda$trace$39(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2547:2547 -> a
+    26:26:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexReference,java.util.Map):2593:2593 -> a
+    27:27:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2598:2598 -> a
+    28:28:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
+    28:28:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2598 -> a
+    29:29:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2599:2599 -> a
+    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
+    30:30:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2599 -> a
+    31:31:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2600:2600 -> a
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
+    32:32:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2599 -> a
+    33:33:void lambda$markMethodAsLive$42(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2775:2775 -> a
+    34:34:void lambda$markMethodAsLive$43(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2782:2782 -> a
+    1:1:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):129:129 -> access$1000
+    1:1:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):129:129 -> access$1100
+    1:1:void access$1200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):129:129 -> access$1200
+    1:1:void access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):129:129 -> access$1300
+    1:1:void access$500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):129:129 -> access$500
+    1:1:com.android.tools.r8.graph.AppView access$600(com.android.tools.r8.shaking.Enqueuer):129:129 -> access$600
+    1:1:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):129:129 -> access$700
+    1:1:com.android.tools.r8.utils.InternalOptions access$800(com.android.tools.r8.shaking.Enqueuer):129:129 -> access$800
+    1:1:com.android.tools.r8.graph.DexProgramClass access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):129:129 -> access$900
+    1:8:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):2589:2596 -> addConsequentRootSet
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$27(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1809 -> b
-    2:2:java.lang.Boolean lambda$traceStaticFieldWrite$10(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1079:1079 -> b
-    3:3:void lambda$markTypeAsLive$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1240:1240 -> b
-    4:4:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$19(com.android.tools.r8.graph.DexProgramClass):1286:1286 -> b
-    5:5:java.util.Set lambda$handleAnnotation$20(com.android.tools.r8.graph.DexType):1316:1316 -> b
-    6:6:void lambda$markMethodAsTargeted$21(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1485:1485 -> b
-    7:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$23(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1770:1770 -> b
-    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$30(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1940:1940 -> b
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$12(com.android.tools.r8.graph.DexType):1153:1153 -> c
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$24(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1771:1771 -> c
-    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$25(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1778:1778 -> c
-    4:4:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$32(com.android.tools.r8.graph.DexProgramClass):2048:2048 -> c
-    1:1:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.DexEncodedMethod):1099:1099 -> classReferencedFromReporter
+    1:1:void lambda$markStaticFieldAsLive$27(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1831 -> b
+    2:2:java.util.Map lambda$traceCallSite$4(com.android.tools.r8.graph.DexEncodedMethod):636:636 -> b
+    3:3:java.lang.Boolean lambda$traceStaticFieldWrite$10(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1101:1101 -> b
+    4:4:void lambda$markTypeAsLive$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1262:1262 -> b
+    5:5:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$19(com.android.tools.r8.graph.DexProgramClass):1308:1308 -> b
+    6:6:java.util.Set lambda$handleAnnotation$20(com.android.tools.r8.graph.DexType):1338:1338 -> b
+    7:7:void lambda$markMethodAsTargeted$21(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1507:1507 -> b
+    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$23(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1792:1792 -> b
+    9:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$30(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1966:1966 -> b
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$12(com.android.tools.r8.graph.DexType):1175:1175 -> c
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$24(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1793:1793 -> c
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$25(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1800:1800 -> c
+    4:4:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$32(com.android.tools.r8.graph.DexProgramClass):2074:2074 -> c
+    1:1:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.DexEncodedMethod):1121:1121 -> classReferencedFromReporter
     1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):523:526 -> compatEnqueueHolderIfDependentNonStaticMember
-    1:5:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2460:2464 -> computeDelayedInterfaceMethodSyntheticBridges
-    6:10:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2463:2467 -> computeDelayedInterfaceMethodSyntheticBridges
-    1:23:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2256:2278 -> createAppInfo
-    24:63:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2277:2316 -> createAppInfo
-    64:67:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2315:2318 -> createAppInfo
-    1:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():343:347 -> createUseRegistryFactory
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$13(com.android.tools.r8.graph.DexType):1172:1172 -> d
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$26(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1780:1780 -> d
-    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$44(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2649:2649 -> d
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$14(com.android.tools.r8.graph.DexType):1179:1179 -> e
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$45(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2653:2653 -> e
-    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1294:1294 -> enqueueDependentItem
+    1:5:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2606:2610 -> computeDelayedInterfaceMethodSyntheticBridges
+    6:10:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2609:2613 -> computeDelayedInterfaceMethodSyntheticBridges
+    1:25:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2296:2320 -> createAppInfo
+    26:67:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2319:2360 -> createAppInfo
+    68:71:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2359:2362 -> createAppInfo
+    1:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():370:374 -> createUseRegistryFactory
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$13(com.android.tools.r8.graph.DexType):1194:1194 -> d
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$26(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1802:1802 -> d
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$45(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2795:2795 -> d
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$14(com.android.tools.r8.graph.DexType):1201:1201 -> e
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$46(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2799:2799 -> e
+    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1316:1316 -> enqueueDependentItem
     1:11:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):495:505 -> enqueueFirstNonSerializableClassInitializer
-    12:12:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> enqueueFirstNonSerializableClassInitializer
+    12:12:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> enqueueFirstNonSerializableClassInitializer
     12:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):506 -> enqueueFirstNonSerializableClassInitializer
     13:13:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):506:506 -> enqueueFirstNonSerializableClassInitializer
     1:3:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):513:515 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueRootItem(java.util.Map$Entry):424:424 -> enqueueRootItem
+    1:1:void enqueueRootItem(java.util.Map$Entry):423:423 -> enqueueRootItem
     2:2:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):175:175 -> enqueueRootItem
-    2:2:void enqueueRootItem(java.util.Map$Entry):424 -> enqueueRootItem
-    3:3:void enqueueRootItem(java.util.Map$Entry):426:426 -> enqueueRootItem
-    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):434:434 -> enqueueRootItem
-    1:1:void enqueueRootItems(java.util.Map):420:420 -> enqueueRootItems
-    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1428:1440 -> ensureFromLibraryOrThrow
+    2:2:void enqueueRootItem(java.util.Map$Entry):423 -> enqueueRootItem
+    3:3:void enqueueRootItem(java.util.Map$Entry):425:425 -> enqueueRootItem
+    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):433:433 -> enqueueRootItem
+    1:1:void enqueueRootItems(java.util.Map):419:419 -> enqueueRootItems
+    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1450:1462 -> ensureFromLibraryOrThrow
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> ensureFromLibraryOrThrow
-    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1440 -> ensureFromLibraryOrThrow
-    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1441:1452 -> ensureFromLibraryOrThrow
-    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1249:1252 -> ensureMethodsContinueToWidenAccess
-    5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1257:1261 -> ensureMethodsContinueToWidenAccess
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$15(com.android.tools.r8.graph.DexType):1202:1202 -> f
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$43(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2641:2641 -> f
-    1:4:void finalizeLibraryMethodOverrideInformation():2237:2240 -> finalizeLibraryMethodOverrideInformation
-    1:33:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2094:2126 -> findAndMarkResolutionTarget
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):538:538 -> g
-    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2143:2147 -> generatedEnumValuesMethod
-    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2146:2151 -> generatedEnumValuesMethod
-    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():339:339 -> getGraphReporter
-    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1110:1110 -> getInvokeSuperTarget
+    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1462 -> ensureFromLibraryOrThrow
+    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1463:1474 -> ensureFromLibraryOrThrow
+    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1271:1274 -> ensureMethodsContinueToWidenAccess
+    5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1279:1283 -> ensureMethodsContinueToWidenAccess
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$15(com.android.tools.r8.graph.DexType):1224:1224 -> f
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$44(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2787:2787 -> f
+    1:4:void finalizeLibraryMethodOverrideInformation():2277:2280 -> finalizeLibraryMethodOverrideInformation
+    1:33:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2118:2150 -> findAndMarkResolutionTarget
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):538:538 -> g
+    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2167:2171 -> generatedEnumValuesMethod
+    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2170:2175 -> generatedEnumValuesMethod
+    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():366:366 -> getGraphReporter
+    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1132:1132 -> getInvokeSuperTarget
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> getInvokeSuperTarget
-    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1110 -> getInvokeSuperTarget
-    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1111:1114 -> getInvokeSuperTarget
+    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1132 -> getInvokeSuperTarget
+    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1133:1136 -> getInvokeSuperTarget
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> getInvokeSuperTarget
-    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1114 -> getInvokeSuperTarget
-    8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1115:1120 -> getInvokeSuperTarget
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():335:335 -> getMode
-    1:24:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):388:411 -> getNonPinnedWrittenFields
-    25:25:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):407:407 -> getNonPinnedWrittenFields
-    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):364:364 -> getProgramClassOrNull
+    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1136 -> getInvokeSuperTarget
+    8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1137:1142 -> getInvokeSuperTarget
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():362:362 -> getMode
+    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):391:391 -> getProgramClassOrNull
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> getProgramClassOrNull
-    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):364 -> getProgramClassOrNull
-    3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):366:374 -> getProgramClassOrNull
-    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():351:351 -> getUseRegistryFactory
-    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1308:1310 -> handleAnnotation
+    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):391 -> getProgramClassOrNull
+    3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):393:401 -> getProgramClassOrNull
+    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():378:378 -> getUseRegistryFactory
+    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1330:1332 -> handleAnnotation
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> handleAnnotation
-    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1310 -> handleAnnotation
-    5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1311:1324 -> handleAnnotation
-    1:19:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2474:2492 -> handleInterfaceMethodSyntheticBridgeAction
-    20:26:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2488:2494 -> handleInterfaceMethodSyntheticBridgeAction
-    27:31:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2493:2497 -> handleInterfaceMethodSyntheticBridgeAction
-    1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1395:1423 -> handleInvokeOfDirectTarget
-    1:15:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1337:1351 -> handleInvokeOfStaticTarget
-    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2790:2797 -> handleJavaLangClassNewInstance
-    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2796:2804 -> handleJavaLangClassNewInstance
-    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> handleJavaLangClassNewInstance
-    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2808 -> handleJavaLangClassNewInstance
-    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2810:2813 -> handleJavaLangClassNewInstance
-    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2965:2970 -> handleJavaLangEnumValueOf
-    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2820:2840 -> handleJavaLangReflectConstructorNewInstance
-    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2839:2865 -> handleJavaLangReflectConstructorNewInstance
-    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> handleJavaLangReflectConstructorNewInstance
-    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2867 -> handleJavaLangReflectConstructorNewInstance
-    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2869:2913 -> handleJavaLangReflectConstructorNewInstance
-    1:32:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2923:2954 -> handleJavaLangReflectProxyNewProxyInstance
-    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2683:2689 -> handleReflectiveBehavior
-    8:50:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2694:2736 -> handleReflectiveBehavior
-    51:51:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> handleReflectiveBehavior
-    51:51:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2737 -> handleReflectiveBehavior
-    52:63:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2738:2749 -> handleReflectiveBehavior
+    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1332 -> handleAnnotation
+    5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1333:1346 -> handleAnnotation
+    1:19:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2620:2638 -> handleInterfaceMethodSyntheticBridgeAction
+    20:26:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2634:2640 -> handleInterfaceMethodSyntheticBridgeAction
+    27:31:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2639:2643 -> handleInterfaceMethodSyntheticBridgeAction
+    1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1417:1445 -> handleInvokeOfDirectTarget
+    1:15:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1359:1373 -> handleInvokeOfStaticTarget
+    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2936:2943 -> handleJavaLangClassNewInstance
+    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2942:2950 -> handleJavaLangClassNewInstance
+    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> handleJavaLangClassNewInstance
+    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2954 -> handleJavaLangClassNewInstance
+    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2956:2959 -> handleJavaLangClassNewInstance
+    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):3111:3116 -> handleJavaLangEnumValueOf
+    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2966:2986 -> handleJavaLangReflectConstructorNewInstance
+    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2985:3011 -> handleJavaLangReflectConstructorNewInstance
+    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> handleJavaLangReflectConstructorNewInstance
+    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):3013 -> handleJavaLangReflectConstructorNewInstance
+    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):3015:3059 -> handleJavaLangReflectConstructorNewInstance
+    1:32:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):3069:3100 -> handleJavaLangReflectProxyNewProxyInstance
+    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2829:2835 -> handleReflectiveBehavior
+    8:50:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2840:2882 -> handleReflectiveBehavior
+    51:51:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> handleReflectiveBehavior
+    51:51:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2883 -> handleReflectiveBehavior
+    52:63:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2884:2895 -> handleReflectiveBehavior
     64:64:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):180:180 -> handleReflectiveBehavior
-    64:64:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2749 -> handleReflectiveBehavior
-    65:81:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2758:2774 -> handleReflectiveBehavior
+    64:64:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2895 -> handleReflectiveBehavior
+    65:81:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2904:2920 -> handleReflectiveBehavior
     82:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> handleReflectiveBehavior
-    82:82:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2774 -> handleReflectiveBehavior
-    83:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2778:2783 -> handleReflectiveBehavior
-    89:90:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2780:2781 -> handleReflectiveBehavior
-    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3009:3021 -> handleServiceInstantiation
-    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2976:2994 -> handleServiceLoaderInvocation
-    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2987:3003 -> handleServiceLoaderInvocation
-    1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):439:446 -> internalEnqueueRootItem
-    9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> internalEnqueueRootItem
-    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447 -> internalEnqueueRootItem
-    10:14:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):448:452 -> internalEnqueueRootItem
-    15:20:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):449:454 -> internalEnqueueRootItem
-    21:21:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):782:782 -> internalEnqueueRootItem
-    21:21:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):454 -> internalEnqueueRootItem
-    22:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):455:466 -> internalEnqueueRootItem
-    34:46:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):463:475 -> internalEnqueueRootItem
-    47:55:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):472:480 -> internalEnqueueRootItem
-    56:56:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):478:478 -> internalEnqueueRootItem
-    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1900:1900 -> isFieldLive
-    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1904:1905 -> isFieldRead
-    1:2:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1910:1911 -> isFieldWrittenInMethodSatisfying
-    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1915:1919 -> isFieldWrittenOutsideDefaultConstructor
+    82:82:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2920 -> handleReflectiveBehavior
+    83:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2924:2929 -> handleReflectiveBehavior
+    89:90:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2926:2927 -> handleReflectiveBehavior
+    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3155:3167 -> handleServiceInstantiation
+    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):3122:3140 -> handleServiceLoaderInvocation
+    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):3133:3149 -> handleServiceLoaderInvocation
+    1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):438:445 -> internalEnqueueRootItem
+    9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> internalEnqueueRootItem
+    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):446 -> internalEnqueueRootItem
+    10:14:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447:451 -> internalEnqueueRootItem
+    15:20:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):448:453 -> internalEnqueueRootItem
+    21:21:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):787:787 -> internalEnqueueRootItem
+    21:21:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):453 -> internalEnqueueRootItem
+    22:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):454:465 -> internalEnqueueRootItem
+    34:46:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):462:474 -> internalEnqueueRootItem
+    47:55:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):471:479 -> internalEnqueueRootItem
+    56:56:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):477:477 -> internalEnqueueRootItem
+    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1926:1926 -> isFieldLive
+    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1930:1931 -> isFieldRead
+    1:2:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1936:1937 -> isFieldWrittenInMethodSatisfying
+    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1941:1945 -> isFieldWrittenOutsideDefaultConstructor
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> isFieldWrittenOutsideDefaultConstructor
-    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1919 -> isFieldWrittenOutsideDefaultConstructor
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> isFieldWrittenOutsideDefaultConstructor
-    7:7:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1920 -> isFieldWrittenOutsideDefaultConstructor
-    8:9:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1922:1923 -> isFieldWrittenOutsideDefaultConstructor
-    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> isFieldWrittenOutsideDefaultConstructor
-    10:10:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1920 -> isFieldWrittenOutsideDefaultConstructor
-    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1927:1927 -> isInstantiatedOrHasInstantiatedSubtype
-    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):360:360 -> isProgramClass
-    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2334:2339 -> joinIdentifierNameStrings
-    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2665:2670 -> markClassAsInstantiatedWithCompatRule
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> markClassAsInstantiatedWithCompatRule
-    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2671 -> markClassAsInstantiatedWithCompatRule
-    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2672:2674 -> markClassAsInstantiatedWithCompatRule
-    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2672:2672 -> markClassAsInstantiatedWithCompatRule
-    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2657:2659 -> markClassAsInstantiatedWithReason
-    4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> markClassAsInstantiatedWithReason
-    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2659 -> markClassAsInstantiatedWithReason
-    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2659:2659 -> markClassAsInstantiatedWithReason
-    1:1:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1356:1356 -> markDirectAndIndirectClassInitializersAsLive
+    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1945 -> isFieldWrittenOutsideDefaultConstructor
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> isFieldWrittenOutsideDefaultConstructor
+    7:7:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1946 -> isFieldWrittenOutsideDefaultConstructor
+    8:9:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1948:1949 -> isFieldWrittenOutsideDefaultConstructor
+    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> isFieldWrittenOutsideDefaultConstructor
+    10:10:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1946 -> isFieldWrittenOutsideDefaultConstructor
+    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1953:1953 -> isInstantiatedOrHasInstantiatedSubtype
+    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):387:387 -> isProgramClass
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2480:2485 -> joinIdentifierNameStrings
+    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2811:2816 -> markClassAsInstantiatedWithCompatRule
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> markClassAsInstantiatedWithCompatRule
+    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2817 -> markClassAsInstantiatedWithCompatRule
+    8:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2818:2818 -> markClassAsInstantiatedWithCompatRule
+    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2803:2805 -> markClassAsInstantiatedWithReason
+    4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> markClassAsInstantiatedWithReason
+    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2805 -> markClassAsInstantiatedWithReason
+    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2805:2805 -> markClassAsInstantiatedWithReason
+    1:1:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1378:1378 -> markDirectAndIndirectClassInitializersAsLive
     2:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> markDirectAndIndirectClassInitializersAsLive
-    2:3:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1357 -> markDirectAndIndirectClassInitializersAsLive
-    4:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1358:1370 -> markDirectAndIndirectClassInitializersAsLive
-    1:7:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1378:1384 -> markDirectClassInitializerAsLive
-    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1869:1881 -> markDirectStaticOrConstructorMethodAsLive
+    2:3:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1379 -> markDirectAndIndirectClassInitializersAsLive
+    4:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1380:1392 -> markDirectAndIndirectClassInitializersAsLive
+    1:7:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1400:1406 -> markDirectClassInitializerAsLive
+    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1895:1907 -> 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):1880 -> markDirectStaticOrConstructorMethodAsLive
-    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2155:2161 -> markEnumValuesAsReachable
-    1:2:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2131:2132 -> markFailedResolutionTargets
-    1:5:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2544:2548 -> markFieldAsKept
-    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1770:1771 -> markFieldAsTargeted
-    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1813:1818 -> markInstanceFieldAsLive
+    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1906 -> markDirectStaticOrConstructorMethodAsLive
+    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2179:2185 -> markEnumValuesAsReachable
+    1:2:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2155:2156 -> markFailedResolutionTargets
+    1:5:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2690:2694 -> markFieldAsKept
+    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1792:1793 -> markFieldAsTargeted
+    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1835:1840 -> 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):1818 -> markInstanceFieldAsLive
-    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1820:1827 -> markInstanceFieldAsLive
-    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1932:1934 -> markInstanceFieldAsReachable
+    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1840 -> markInstanceFieldAsLive
+    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1842:1849 -> markInstanceFieldAsLive
+    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1958:1960 -> 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):1934 -> markInstanceFieldAsReachable
-    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1937:1960 -> markInstanceFieldAsReachable
-    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1832:1833 -> markInstantiated
+    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1960 -> markInstanceFieldAsReachable
+    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1963:1986 -> markInstanceFieldAsReachable
+    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1854:1855 -> 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):1833 -> markInstantiated
-    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1835:1835 -> markInstantiated
-    1:7:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):484:490 -> markInterfaceAsInstantiated
-    1:20:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1268:1287 -> markInterfaceTypeAsLiveViaInheritanceClause
-    21:21:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1274:1274 -> markInterfaceTypeAsLiveViaInheritanceClause
-    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1839:1839 -> markLambdaInstantiated
+    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1855 -> markInstantiated
+    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1857:1857 -> markInstantiated
+    1:8:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):483:490 -> markInterfaceAsInstantiated
+    1:20:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1290:1309 -> markInterfaceTypeAsLiveViaInheritanceClause
+    21:21:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1296:1296 -> markInterfaceTypeAsLiveViaInheritanceClause
+    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1861:1861 -> markLambdaInstantiated
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> markLambdaInstantiated
-    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1839 -> markLambdaInstantiated
-    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1841:1862 -> markLambdaInstantiated
-    1:25:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1634:1658 -> markLibraryAndClasspathMethodOverridesAsLive
-    1:23:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2510:2532 -> markMethodAsKept
-    24:33:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2529:2538 -> markMethodAsKept
-    1:16:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2599:2614 -> markMethodAsLive
+    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1861 -> markLambdaInstantiated
+    3:28:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1863:1888 -> markLambdaInstantiated
+    1:25:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1656:1680 -> markLibraryAndClasspathMethodOverridesAsLive
+    1:23:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2656:2678 -> markMethodAsKept
+    24:33:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2675:2684 -> markMethodAsKept
+    1:16:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2745:2760 -> markMethodAsLive
     17:17:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsLive
-    17:17:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2614 -> markMethodAsLive
-    18:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2616:2620 -> markMethodAsLive
-    23:26:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2619:2622 -> markMethodAsLive
-    27:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2621:2636 -> markMethodAsLive
-    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2679:2679 -> markMethodAsLiveWithCompatRule
-    1:12:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1477:1488 -> markMethodAsTargeted
+    17:17:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2760 -> markMethodAsLive
+    18:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2762:2766 -> markMethodAsLive
+    23:26:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2765:2768 -> markMethodAsLive
+    27:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2767:2782 -> markMethodAsLive
+    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2825:2825 -> markMethodAsLiveWithCompatRule
+    1:12:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1499:1510 -> 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):1488 -> markMethodAsTargeted
-    14:18:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1490:1494 -> markMethodAsTargeted
-    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1391:1391 -> markNonStaticDirectMethodAsReachable
+    13:13:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1510 -> markMethodAsTargeted
+    14:18:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1512:1516 -> markMethodAsTargeted
+    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1413:1413 -> markNonStaticDirectMethodAsReachable
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> markOverridesAsLibraryMethodOverrides
-    1:2:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1676 -> markOverridesAsLibraryMethodOverrides
-    3:17:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1677:1691 -> markOverridesAsLibraryMethodOverrides
-    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2647:2651 -> markParameterAndReturnTypesAsLive
-    1:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2040:2041 -> markPossibleTargetsAsReachable
+    1:2:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1698 -> markOverridesAsLibraryMethodOverrides
+    3:17:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1699:1713 -> markOverridesAsLibraryMethodOverrides
+    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2793:2797 -> markParameterAndReturnTypesAsLive
+    1:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2066:2067 -> markPossibleTargetsAsReachable
     3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():290:290 -> markPossibleTargetsAsReachable
-    3:3:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2041 -> markPossibleTargetsAsReachable
-    4:47:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2041:2084 -> markPossibleTargetsAsReachable
-    48:54:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2081:2087 -> markPossibleTargetsAsReachable
-    55:58:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2064:2067 -> markPossibleTargetsAsReachable
-    59:59:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2064:2064 -> markPossibleTargetsAsReachable
-    1:3:void markReferencedTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2640:2642 -> markReferencedTypesAsLive
-    1:7:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1663:1669 -> markResolutionAsLive
-    8:8:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1668:1668 -> markResolutionAsLive
-    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1776:1794 -> markStaticFieldAsLive
+    3:3:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2067 -> markPossibleTargetsAsReachable
+    4:48:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2067:2111 -> markPossibleTargetsAsReachable
+    49:53:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2105:2105 -> markPossibleTargetsAsReachable
+    54:58:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2088:2088 -> markPossibleTargetsAsReachable
+    1:3:void markReferencedTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2786:2788 -> markReferencedTypesAsLive
+    1:7:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1685:1691 -> markResolutionAsLive
+    8:8:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1690:1690 -> markResolutionAsLive
+    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1798:1816 -> 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):1794 -> markStaticFieldAsLive
-    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1797:1798 -> markStaticFieldAsLive
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1816 -> markStaticFieldAsLive
+    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1819:1820 -> 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):1798 -> markStaticFieldAsLive
-    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1802:1809 -> markStaticFieldAsLive
-    1:9:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2167:2175 -> markSuperMethodAsReachable
-    10:27:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2174:2191 -> markSuperMethodAsReachable
+    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1820 -> markStaticFieldAsLive
+    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1824:1831 -> markStaticFieldAsLive
+    1:9:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2191:2199 -> markSuperMethodAsReachable
+    10:27:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2198:2215 -> markSuperMethodAsReachable
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markSuperMethodAsReachable
-    28:28:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2191 -> markSuperMethodAsReachable
-    29:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2194:2199 -> markSuperMethodAsReachable
-    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1139:1154 -> markTypeAsLive
-    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1151:1151 -> markTypeAsLive
-    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1158:1173 -> markTypeAsLive
-    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1170:1170 -> markTypeAsLive
-    35:37:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1177:1179 -> markTypeAsLive
-    38:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1177:1177 -> markTypeAsLive
-    39:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185:1190 -> markTypeAsLive
+    28:28:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2215 -> markSuperMethodAsReachable
+    29:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2218:2223 -> markSuperMethodAsReachable
+    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1161:1176 -> markTypeAsLive
+    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1173:1173 -> markTypeAsLive
+    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1180:1195 -> markTypeAsLive
+    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1192:1192 -> markTypeAsLive
+    35:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1199:1199 -> markTypeAsLive
+    39:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1207:1212 -> 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):1190 -> markTypeAsLive
-    46:97:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1193:1244 -> markTypeAsLive
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> markTypeAsLive
-    98:98:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1245 -> markTypeAsLive
-    99:99:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1245:1245 -> markTypeAsLive
-    100:100:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1244:1244 -> markTypeAsLive
-    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1887:1891 -> markVirtualMethodAsLive
-    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1889:1894 -> markVirtualMethodAsLive
+    45:45:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1212 -> markTypeAsLive
+    46:97:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1215:1266 -> markTypeAsLive
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> markTypeAsLive
+    98:98:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1267 -> markTypeAsLive
+    99:99:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1267:1267 -> markTypeAsLive
+    100:100:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1266:1266 -> markTypeAsLive
+    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1913:1917 -> markVirtualMethodAsLive
+    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1915:1920 -> 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):1894 -> markVirtualMethodAsLive
-    1:28:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1967:1994 -> markVirtualMethodAsReachable
+    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1920 -> markVirtualMethodAsLive
+    1:28:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1993:2020 -> markVirtualMethodAsReachable
     29:29:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsReachable
-    29:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1994 -> markVirtualMethodAsReachable
-    30:54:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1998:2022 -> markVirtualMethodAsReachable
+    29:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2020 -> markVirtualMethodAsReachable
+    30:54:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2024:2048 -> markVirtualMethodAsReachable
     55:55:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):80:80 -> markVirtualMethodAsReachable
-    55:55:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2025 -> markVirtualMethodAsReachable
-    56:59:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2026:2029 -> markVirtualMethodAsReachable
+    55:55:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2051 -> markVirtualMethodAsReachable
+    56:59:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2052:2055 -> markVirtualMethodAsReachable
     60:60:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():290:290 -> markVirtualMethodAsReachable
-    60:60:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2030 -> markVirtualMethodAsReachable
-    61:61:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2033:2033 -> markVirtualMethodAsReachable
-    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():416:416 -> newSetWithoutReasonReporter
-    1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1536:1548 -> populateInstantiatedTypesCache
-    1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1304:1304 -> processAnnotation
-    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1298:1299 -> processAnnotations
-    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1506:1520 -> processNewlyInstantiatedClass
+    60:60:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2056 -> markVirtualMethodAsReachable
+    61:61:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2059:2059 -> markVirtualMethodAsReachable
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():415:415 -> newSetWithoutReasonReporter
+    1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1558:1570 -> populateInstantiatedTypesCache
+    1:17:com.android.tools.r8.graph.DexApplication postProcessLambdaDesugaring(com.android.tools.r8.graph.AppInfoWithSubtyping):2367:2383 -> postProcessLambdaDesugaring
+    18:22:java.util.Map com.android.tools.r8.ir.desugar.LambdaRewriter.getWritesWithContexts(com.android.tools.r8.graph.DexProgramClass):105:109 -> postProcessLambdaDesugaring
+    18:22:com.android.tools.r8.graph.DexApplication postProcessLambdaDesugaring(com.android.tools.r8.graph.AppInfoWithSubtyping):2384 -> postProcessLambdaDesugaring
+    23:41:com.android.tools.r8.graph.DexApplication postProcessLambdaDesugaring(com.android.tools.r8.graph.AppInfoWithSubtyping):2385:2403 -> postProcessLambdaDesugaring
+    42:42:java.util.Map com.android.tools.r8.ir.desugar.LambdaRewriter.getWritesWithContexts(com.android.tools.r8.graph.DexProgramClass):105:105 -> postProcessLambdaDesugaring
+    42:42:com.android.tools.r8.graph.DexApplication postProcessLambdaDesugaring(com.android.tools.r8.graph.AppInfoWithSubtyping):2384 -> postProcessLambdaDesugaring
+    43:50:com.android.tools.r8.graph.DexApplication postProcessLambdaDesugaring(com.android.tools.r8.graph.AppInfoWithSubtyping):2408:2415 -> postProcessLambdaDesugaring
+    51:51:com.android.tools.r8.graph.DexApplication postProcessLambdaDesugaring(com.android.tools.r8.graph.AppInfoWithSubtyping):2368:2368 -> postProcessLambdaDesugaring
+    1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1326:1326 -> processAnnotation
+    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1320:1321 -> processAnnotations
+    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1528:1542 -> 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):1520 -> processNewlyInstantiatedClass
-    17:26:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1523:1532 -> processNewlyInstantiatedClass
-    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):355:355 -> registerAnalysis
-    1:7:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):763:769 -> registerDeferredActionForDeadProtoBuilder
-    8:8:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):765:765 -> registerDeferredActionForDeadProtoBuilder
-    1:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):553:554 -> registerFieldAccess
-    3:31:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):559:587 -> registerFieldAccess
+    16:16:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1542 -> processNewlyInstantiatedClass
+    17:26:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1545:1554 -> processNewlyInstantiatedClass
+    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):382:382 -> registerAnalysis
+    1:7:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):785:791 -> registerDeferredActionForDeadProtoBuilder
+    8:8:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):787:787 -> registerDeferredActionForDeadProtoBuilder
+    1:32:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):568:599 -> registerFieldAccess
     1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):545:545 -> registerFieldRead
-    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):549:549 -> registerFieldWrite
+    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):553:553 -> registerFieldWrite
     1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):536:539 -> registerMethodWithTargetAndContext
-    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1458:1459 -> reportMissingClass
+    1:2:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):561:562 -> registerReflectiveFieldAccess
+    1:1:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):549:549 -> registerReflectiveFieldRead
+    1:1:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):557:557 -> registerReflectiveFieldWrite
+    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1480:1481 -> 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):1459 -> reportMissingClass
-    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1470:1471 -> reportMissingField
+    3:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1481 -> reportMissingClass
+    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1492:1493 -> 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):1471 -> reportMissingField
-    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1464:1465 -> reportMissingMethod
+    3:3:void reportMissingField(com.android.tools.r8.graph.DexField):1493 -> reportMissingField
+    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1486:1487 -> 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):1465 -> reportMissingMethod
-    1:4:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1328:1331 -> resolveMethod
-    1:1:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2554:2554 -> shouldMarkLibraryMethodOverrideAsReachable
+    3:3:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1487 -> reportMissingMethod
+    1:4:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1350:1353 -> resolveMethod
+    1:46:void rewriteLambdaCallSites(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):2420:2465 -> rewriteLambdaCallSites
+    1:1:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2700:2700 -> shouldMarkLibraryMethodOverrideAsReachable
     2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():290:290 -> shouldMarkLibraryMethodOverrideAsReachable
-    2:2:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2556 -> shouldMarkLibraryMethodOverrideAsReachable
-    3:19:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2556:2572 -> shouldMarkLibraryMethodOverrideAsReachable
+    2:2:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2702 -> shouldMarkLibraryMethodOverrideAsReachable
+    3:19:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2702:2718 -> shouldMarkLibraryMethodOverrideAsReachable
     20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> shouldMarkLibraryMethodOverrideAsReachable
-    20:20:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2572 -> shouldMarkLibraryMethodOverrideAsReachable
-    21:33:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2577:2589 -> shouldMarkLibraryMethodOverrideAsReachable
-    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2324:2329 -> toSortedDescriptorSet
-    1:84:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2345:2428 -> trace
-    85:96:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2427:2438 -> trace
-    97:97:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2436:2436 -> trace
-    1:10:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2224:2233 -> traceApplication
-    1:62:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):591:652 -> traceCallSite
-    63:63:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):649:649 -> traceCallSite
-    64:64:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):646:646 -> traceCallSite
-    65:65:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):643:643 -> traceCallSite
-    66:66:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):640:640 -> traceCallSite
-    67:106:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):637:676 -> traceCallSite
-    1:1:boolean traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):682:682 -> traceCheckCast
-    1:8:boolean traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):688:695 -> traceConstClass
-    1:10:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):699:708 -> traceConstClassOrCheckCast
-    11:11:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):707:707 -> traceConstClassOrCheckCast
-    1:20:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):934:953 -> traceInstanceFieldRead
+    20:20:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2718 -> shouldMarkLibraryMethodOverrideAsReachable
+    21:33:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2723:2735 -> shouldMarkLibraryMethodOverrideAsReachable
+    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2470:2475 -> toSortedDescriptorSet
+    1:84:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2491:2574 -> trace
+    85:96:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2573:2584 -> trace
+    97:97:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2582:2582 -> trace
+    1:18:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2248:2265 -> traceApplication
+    19:40: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):2252:2273 -> traceApplication
+    1:76:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):603:678 -> traceCallSite
+    77:77:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):675:675 -> traceCallSite
+    78:78:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):672:672 -> traceCallSite
+    79:79:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):669:669 -> traceCallSite
+    80:80:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):666:666 -> traceCallSite
+    81:116:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):663:698 -> traceCallSite
+    1:1:boolean traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):704:704 -> traceCheckCast
+    1:8:boolean traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):710:717 -> traceConstClass
+    1:10:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):721:730 -> traceConstClassOrCheckCast
+    11:11:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):729:729 -> traceConstClassOrCheckCast
+    1:20:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):956:975 -> traceInstanceFieldRead
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldRead
-    21:21:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):953 -> traceInstanceFieldRead
-    22:30:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):958:966 -> traceInstanceFieldRead
-    31:31:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):965:965 -> traceInstanceFieldRead
-    1:20:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):971:990 -> traceInstanceFieldWrite
+    21:21:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):975 -> traceInstanceFieldRead
+    22:30:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):980:988 -> traceInstanceFieldRead
+    31:31:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):987:987 -> traceInstanceFieldRead
+    1:20:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):993:1012 -> traceInstanceFieldWrite
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldWrite
-    21:21:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):990 -> traceInstanceFieldWrite
-    22:30:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):995:1003 -> traceInstanceFieldWrite
-    1:15:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):743:757 -> traceInvokeDirect
-    16:16:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):756:756 -> traceInvokeDirect
-    17:22:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):781:786 -> traceInvokeDirect
+    21:21:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1012 -> traceInstanceFieldWrite
+    22:30:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1017:1025 -> traceInstanceFieldWrite
+    1:15:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):765:779 -> traceInvokeDirect
+    16:16:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):778:778 -> traceInvokeDirect
+    17:22:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):803:808 -> traceInvokeDirect
     23:23:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeDirect
-    23:23:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):786 -> traceInvokeDirect
-    24:24:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):788:788 -> traceInvokeDirect
-    1:2:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):775:776 -> traceInvokeDirectFromLambda
-    3:3:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):775:775 -> traceInvokeDirectFromLambda
-    1:2:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):793:794 -> traceInvokeInterface
-    3:3:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):793:793 -> traceInvokeInterface
-    4:9:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):804:809 -> traceInvokeInterface
+    23:23:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):808 -> traceInvokeDirect
+    24:24:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):810:810 -> traceInvokeDirect
+    1:3:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):797:797 -> traceInvokeDirectFromLambda
+    1:3:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):815:815 -> traceInvokeInterface
+    4:9:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):826:831 -> traceInvokeInterface
     10:10:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeInterface
-    10:10:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):809 -> traceInvokeInterface
-    11:11:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):811:811 -> traceInvokeInterface
-    1:2:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):798:799 -> traceInvokeInterfaceFromLambda
-    3:3:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):798:798 -> traceInvokeInterfaceFromLambda
-    1:2:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):816:817 -> traceInvokeStatic
-    3:3:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):816:816 -> traceInvokeStatic
-    4:28:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):827:851 -> traceInvokeStatic
+    10:10:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):831 -> traceInvokeInterface
+    11:11:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):833:833 -> traceInvokeInterface
+    1:3:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):820:820 -> traceInvokeInterfaceFromLambda
+    1:3:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):838:838 -> traceInvokeStatic
+    4:28:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):849:873 -> traceInvokeStatic
     29:29:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeStatic
-    29:29:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):851 -> traceInvokeStatic
-    30:30:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):853:853 -> traceInvokeStatic
-    1:2:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):821:822 -> traceInvokeStaticFromLambda
-    3:3:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):821:821 -> traceInvokeStaticFromLambda
-    1:10:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):858:867 -> traceInvokeSuper
+    29:29:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):873 -> traceInvokeStatic
+    30:30:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):875:875 -> traceInvokeStatic
+    1:3:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):843:843 -> traceInvokeStaticFromLambda
+    1:10:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):880:889 -> traceInvokeSuper
     11:11:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeSuper
-    11:11:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):867 -> traceInvokeSuper
-    12:12:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):869:869 -> traceInvokeSuper
-    1:2:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):874:875 -> traceInvokeVirtual
-    3:3:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):874:874 -> traceInvokeVirtual
-    4:11:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):885:892 -> traceInvokeVirtual
-    12:23:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):887:898 -> traceInvokeVirtual
+    11:11:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):889 -> traceInvokeSuper
+    12:12:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):891:891 -> traceInvokeSuper
+    1:3:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):896:896 -> traceInvokeVirtual
+    4:11:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):907:914 -> traceInvokeVirtual
+    12:23:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):909:920 -> traceInvokeVirtual
     24:24:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeVirtual
-    24:24:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):898 -> traceInvokeVirtual
-    25:25:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):900:900 -> traceInvokeVirtual
-    1:2:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):879:880 -> traceInvokeVirtualFromLambda
-    3:3:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):879:879 -> traceInvokeVirtualFromLambda
-    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2208:2215 -> traceMainDex
+    24:24:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):920 -> traceInvokeVirtual
+    25:25:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):922:922 -> traceInvokeVirtual
+    1:3:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):901:901 -> traceInvokeVirtualFromLambda
+    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2232:2239 -> traceMainDex
     1:1:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> traceMethodHandle
-    1:1:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):723 -> traceMethodHandle
-    2:10:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):723:731 -> traceMethodHandle
-    1:9:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):905:913 -> traceNewInstance
-    10:16:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):921:927 -> traceNewInstance
-    1:1:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):917:917 -> traceNewInstanceFromLambda
-    1:19:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1008:1026 -> traceStaticFieldRead
+    1:1:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):745 -> traceMethodHandle
+    2:10:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):745:753 -> traceMethodHandle
+    1:9:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):927:935 -> traceNewInstance
+    10:16:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):943:949 -> traceNewInstance
+    1:1:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):939:939 -> traceNewInstanceFromLambda
+    1:19:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1030:1048 -> traceStaticFieldRead
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldRead
-    20:20:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1026 -> traceStaticFieldRead
-    21:28:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1029:1036 -> traceStaticFieldRead
-    29:45:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1032:1048 -> traceStaticFieldRead
-    1:19:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1053:1071 -> traceStaticFieldWrite
+    20:20:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1048 -> traceStaticFieldRead
+    21:28:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1051:1058 -> traceStaticFieldRead
+    29:45:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1054:1070 -> traceStaticFieldRead
+    1:19:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1075:1093 -> traceStaticFieldWrite
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldWrite
-    20:20:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1071 -> traceStaticFieldWrite
-    21:28:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1074:1081 -> traceStaticFieldWrite
-    29:45:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1077:1093 -> traceStaticFieldWrite
-    1:1:boolean traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):738:738 -> traceTypeReference
-    1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1699:1706 -> transitionDefaultMethodsForInstantiatedClass
-    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1747:1750 -> transitionDependentItemsForInstantiatedClass
+    20:20:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1093 -> traceStaticFieldWrite
+    21:28:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1096:1103 -> traceStaticFieldWrite
+    29:45:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1099:1115 -> traceStaticFieldWrite
+    1:1:boolean traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):760:760 -> traceTypeReference
+    1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1721:1728 -> transitionDefaultMethodsForInstantiatedClass
+    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1769:1772 -> transitionDependentItemsForInstantiatedClass
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> transitionDependentItemsForInstantiatedClass
-    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1750 -> transitionDependentItemsForInstantiatedClass
-    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1752:1753 -> transitionDependentItemsForInstantiatedClass
-    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1732:1740 -> transitionFieldsForInstantiatedClass
-    1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1569:1590 -> transitionMethodsForInstantiatedClass
+    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1772 -> transitionDependentItemsForInstantiatedClass
+    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1774:1775 -> transitionDependentItemsForInstantiatedClass
+    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1754:1762 -> transitionFieldsForInstantiatedClass
+    1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1591:1612 -> transitionMethodsForInstantiatedClass
     23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> transitionMethodsForInstantiatedClass
-    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1590 -> transitionMethodsForInstantiatedClass
-    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1592:1618 -> transitionMethodsForInstantiatedClass
+    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1612 -> transitionMethodsForInstantiatedClass
+    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1614:1640 -> transitionMethodsForInstantiatedClass
     51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> transitionMethodsForInstantiatedClass
-    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1618 -> transitionMethodsForInstantiatedClass
-    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1620:1624 -> transitionMethodsForInstantiatedClass
+    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1640 -> transitionMethodsForInstantiatedClass
+    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1642:1646 -> transitionMethodsForInstantiatedClass
     57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> transitionMethodsForInstantiatedClass
-    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1624 -> transitionMethodsForInstantiatedClass
-    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1626:1626 -> transitionMethodsForInstantiatedClass
-    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1712:1720 -> transitionNonAbstractMethodsToLiveAndShadow
-    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1719:1719 -> transitionNonAbstractMethodsToLiveAndShadow
-    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1716:1716 -> transitionNonAbstractMethodsToLiveAndShadow
-    1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1103:1105 -> transitionReachableVirtualMethods
-    1:9:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):1757:1765 -> transitionUnusedInterfaceToLive
-    1:5:void unpinLambdaMethods():2501:2505 -> unpinLambdaMethods
-    1:3:boolean verifyKeptGraph():2247:2249 -> verifyKeptGraph
-    1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1128:1129 -> verifyMethodIsTargeted
-    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1134:1134 -> verifyTypeIsLive
-    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):379:383 -> warnIfLibraryTypeInheritsFromProgramType
+    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1646 -> transitionMethodsForInstantiatedClass
+    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1648:1648 -> transitionMethodsForInstantiatedClass
+    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1734:1742 -> transitionNonAbstractMethodsToLiveAndShadow
+    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1741:1741 -> transitionNonAbstractMethodsToLiveAndShadow
+    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1738:1738 -> transitionNonAbstractMethodsToLiveAndShadow
+    1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1125:1127 -> transitionReachableVirtualMethods
+    1:9:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):1779:1787 -> transitionUnusedInterfaceToLive
+    1:5:void unpinLambdaMethods():2647:2651 -> unpinLambdaMethods
+    1:3:boolean verifyKeptGraph():2287:2289 -> verifyKeptGraph
+    1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1150:1151 -> verifyMethodIsTargeted
+    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1156:1156 -> verifyTypeIsLive
+    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):406:410 -> warnIfLibraryTypeInheritsFromProgramType
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.Enqueuer$1:
-    1:1:void <clinit>():635:635 -> <clinit>
+    1:1:void <clinit>():661:661 -> <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):3200:3200 -> <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):3207:3210 -> <init>
-    1:1:boolean addField(com.android.tools.r8.graph.DexField):3220:3220 -> 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):3346:3346 -> <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):3353:3356 -> <init>
+    1:1:boolean addField(com.android.tools.r8.graph.DexField):3366:3366 -> addField
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> addField
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):3220 -> addField
-    3:13:boolean addField(com.android.tools.r8.graph.DexField):3224:3234 -> addField
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> addField
-    14:14:boolean addField(com.android.tools.r8.graph.DexField):3234 -> addField
-    15:27:boolean addField(com.android.tools.r8.graph.DexField):3234:3246 -> addField
-    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3254:3263 -> addMethod
-    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3262:3269 -> addMethod
-    1:2:boolean addType(com.android.tools.r8.graph.DexType):3299:3300 -> addType
+    2:2:boolean addField(com.android.tools.r8.graph.DexField):3366 -> addField
+    3:13:boolean addField(com.android.tools.r8.graph.DexField):3370:3380 -> addField
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> addField
+    14:14:boolean addField(com.android.tools.r8.graph.DexField):3380 -> addField
+    15:27:boolean addField(com.android.tools.r8.graph.DexField):3380:3392 -> addField
+    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3400:3409 -> addMethod
+    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3408:3415 -> addMethod
+    1:2:boolean addType(com.android.tools.r8.graph.DexType):3445:3446 -> addType
     1:1:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedDescriptor(com.android.tools.r8.graph.DexType):111:111 -> getRenamedDescriptor
     1:1:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):0 -> getRenamedDescriptor
     1:1:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedName(com.android.tools.r8.graph.DexMethod):103:103 -> getRenamedName
@@ -58158,58 +58116,58 @@
     2:2:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedName(com.android.tools.r8.graph.DexField):107:107 -> getRenamedName
     2:2:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):0 -> getRenamedName
 com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet:
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3063:3063 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3059:3064 -> <init>
-    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):3057:3057 -> access$400
-    1:3:boolean add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3068:3070 -> add
-    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):3074:3074 -> contains
-    1:1:java.util.Set getItems():3078:3078 -> getItems
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3209:3209 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3205:3210 -> <init>
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):3203:3203 -> access$400
+    1:3:boolean add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3214:3216 -> add
+    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):3220:3220 -> contains
+    1:1:java.util.Set getItems():3224:3224 -> getItems
 com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget:
-    1:3:void <clinit>():3106:3108 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):3117:3120 -> <init>
-    1:2:boolean equals(java.lang.Object):3136:3137 -> equals
-    1:1:int hashCode():3130:3130 -> hashCode
-    1:1:boolean isUnresolved():3124:3124 -> isUnresolved
-    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():3114:3114 -> unresolved
+    1:3:void <clinit>():3252:3254 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):3263:3266 -> <init>
+    1:2:boolean equals(java.lang.Object):3282:3283 -> equals
+    1:1:int hashCode():3276:3276 -> hashCode
+    1:1:boolean isUnresolved():3270:3270 -> isUnresolved
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():3260:3260 -> unresolved
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.Enqueuer$Mode:
-    1:4:void <clinit>():115:118 -> <clinit>
-    5:5:void <clinit>():114:114 -> <clinit>
-    1:1:void <init>(java.lang.String,int):114:114 -> <init>
-    1:1:boolean isFinalTreeShaking():125:125 -> isFinalTreeShaking
-    1:1:boolean isInitialOrFinalTreeShaking():129:129 -> isInitialOrFinalTreeShaking
-    1:1:boolean isInitialTreeShaking():121:121 -> isInitialTreeShaking
-    1:1:boolean isTracingMainDex():133:133 -> isTracingMainDex
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):114:114 -> valueOf
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():114:114 -> values
+    1:4:void <clinit>():132:135 -> <clinit>
+    5:5:void <clinit>():131:131 -> <clinit>
+    1:1:void <init>(java.lang.String,int):131:131 -> <init>
+    1:1:boolean isFinalTreeShaking():142:142 -> isFinalTreeShaking
+    1:1:boolean isInitialOrFinalTreeShaking():146:146 -> isInitialOrFinalTreeShaking
+    1:1:boolean isInitialTreeShaking():138:138 -> isInitialTreeShaking
+    1:1:boolean isTracingMainDex():150:150 -> isTracingMainDex
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):131:131 -> valueOf
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():131:131 -> values
 com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet:
-    1:4:void <init>():3141:3144 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3141:3141 -> <init>
-    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3155:3162 -> add
-    1:1:java.util.Set getMethods():3147:3147 -> getMethods
-    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3151:3151 -> getReasons
+    1:4:void <init>():3287:3290 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3287:3287 -> <init>
+    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3301:3308 -> add
+    1:1:java.util.Set getMethods():3293:3293 -> getMethods
+    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3297:3297 -> getReasons
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReason:
-    1:1:void <init>(java.util.function.BiConsumer):3088:3088 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):3084:3089 -> <init>
-    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReason):3082:3082 -> access$200
-    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):3093:3094 -> add
-    1:1:boolean contains(java.lang.Object):3098:3098 -> contains
-    1:1:java.util.Set getItems():3102:3102 -> getItems
+    1:1:void <init>(java.util.function.BiConsumer):3234:3234 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):3230:3235 -> <init>
+    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReason):3228:3228 -> access$200
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):3239:3240 -> add
+    1:1:boolean contains(java.lang.Object):3244:3244 -> contains
+    1:1:java.util.Set getItems():3248:3248 -> getItems
 com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason:
-    1:1:void <clinit>():3026:3026 -> <clinit>
-    1:4:void <init>():3026:3029 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3026:3026 -> <init>
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):3046:3046 -> a
-    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):3026:3026 -> access$300
-    1:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3032:3034 -> add
-    1:1:boolean contains(java.lang.Object):3041:3041 -> contains
-    1:1:java.util.Set getItems():3053:3053 -> getItems
-    1:2:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):3045:3046 -> registerDeferredAction
+    1:1:void <clinit>():3172:3172 -> <clinit>
+    1:4:void <init>():3172:3175 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3172:3172 -> <init>
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):3192:3192 -> a
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):3172:3172 -> access$300
+    1:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3178:3180 -> add
+    1:1:boolean contains(java.lang.Object):3187:3187 -> contains
+    1:1:java.util.Set getItems():3199:3199 -> getItems
+    1:2:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):3191:3192 -> registerDeferredAction
 com.android.tools.r8.shaking.Enqueuer$TargetWithContext -> com.android.tools.r8.shaking.Enqueuer$TargetWithContext:
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):3172:3174 -> <init>
-    1:5:boolean equals(java.lang.Object):3192:3196 -> equals
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():3182:3182 -> getContext
-    1:1:com.android.tools.r8.graph.Descriptor getTarget():3178:3178 -> getTarget
-    1:1:int hashCode():3187:3187 -> hashCode
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):3318:3320 -> <init>
+    1:5:boolean equals(java.lang.Object):3338:3342 -> equals
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():3328:3328 -> getContext
+    1:1:com.android.tools.r8.graph.Descriptor getTarget():3324:3324 -> getTarget
+    1:1:int hashCode():3333:3333 -> hashCode
 com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.EnqueuerFactory:
     1:1:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> createForFinalTreeShaking
@@ -58337,10 +58295,10 @@
     1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):196:199 -> reportCompatInstantiated
     5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):197:202 -> reportCompatInstantiated
     1:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):174:175 -> reportCompatKeepDefaultInitializer
-    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> reportCompatKeepDefaultInitializer
+    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> reportCompatKeepDefaultInitializer
     3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):175 -> reportCompatKeepDefaultInitializer
     4:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):175:175 -> reportCompatKeepDefaultInitializer
-    5:5:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> reportCompatKeepDefaultInitializer
+    5:5:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():747:747 -> reportCompatKeepDefaultInitializer
     5:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):175 -> reportCompatKeepDefaultInitializer
     6:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):176:179 -> reportCompatKeepDefaultInitializer
     10:15:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):177:182 -> reportCompatKeepDefaultInitializer
@@ -58386,14 +58344,14 @@
     6:7:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):166:167 -> canRemoveSubsequentKeepRule
     1:15:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):214:228 -> evaluateClassForIfRule
     1:2:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):235:236 -> evaluateIfRuleMembersAndMaterialize
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> evaluateIfRuleMembersAndMaterialize
-    3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():653 -> evaluateIfRuleMembersAndMaterialize
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> evaluateIfRuleMembersAndMaterialize
+    3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():666 -> evaluateIfRuleMembersAndMaterialize
     3:3:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):237 -> evaluateIfRuleMembersAndMaterialize
     4:11:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):237:244 -> evaluateIfRuleMembersAndMaterialize
     12:21:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):242:251 -> evaluateIfRuleMembersAndMaterialize
     22:51:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):249:278 -> evaluateIfRuleMembersAndMaterialize
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> evaluateIfRuleMembersAndMaterialize
-    52:52:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():653 -> evaluateIfRuleMembersAndMaterialize
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> evaluateIfRuleMembersAndMaterialize
+    52:52:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():666 -> evaluateIfRuleMembersAndMaterialize
     52:52:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):284 -> evaluateIfRuleMembersAndMaterialize
     53:54:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):284:285 -> evaluateIfRuleMembersAndMaterialize
     1:10:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):191:200 -> isEffectivelyLive
@@ -58633,7 +58591,7 @@
     1:3:com.android.tools.r8.shaking.MainDexClasses run():61:63 -> run
     1:2:void traceMainDexDirectDependencies():135:136 -> traceMainDexDirectDependencies
     1:12:void traceRuntimeAnnotationsWithEnumForMainDex():67:78 -> traceRuntimeAnnotationsWithEnumForMainDex
-    13:35:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):359:381 -> traceRuntimeAnnotationsWithEnumForMainDex
+    13:35:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):372:394 -> traceRuntimeAnnotationsWithEnumForMainDex
     13:35:void traceRuntimeAnnotationsWithEnumForMainDex():78 -> traceRuntimeAnnotationsWithEnumForMainDex
 com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.MemberValuePropagationRule:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11:11 -> <init>
@@ -58895,111 +58853,115 @@
 com.android.tools.r8.shaking.ProguardClassType$6 -> com.android.tools.r8.shaking.ProguardClassType$6:
     1:1:void <clinit>():43:43 -> <clinit>
 com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.ProguardConfiguration:
-    1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,boolean,boolean,com.android.tools.r8.shaking.ProguardConfiguration$1):20:20 -> <init>
-    2:40:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,boolean,boolean):457:495 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):503:503 -> builder
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():631:631 -> getAdaptClassStrings
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():639:639 -> getAdaptResourceFileContents
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():635:635 -> getAdaptResourceFilenames
-    1:1:java.nio.file.Path getApplyMappingFile():547:547 -> getApplyMappingFile
-    1:1:java.util.List getClassObfuscationDictionary():619:619 -> getClassObfuscationDictionary
-    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():511:511 -> getDexItemFactory
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontNotePatterns():603:603 -> getDontNotePatterns
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns():599:599 -> getDontWarnPatterns
-    1:1:java.util.List getInjars():515:515 -> getInjars
-    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():591:591 -> getKeepAttributes
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():643:643 -> getKeepDirectories
-    1:1:com.android.tools.r8.shaking.ProguardPackageNameList getKeepPackageNamesPatterns():595:595 -> getKeepPackageNamesPatterns
-    1:1:java.util.List getLibraryjars():519:519 -> getLibraryjars
-    1:1:java.util.List getObfuscationDictionary():615:615 -> getObfuscationDictionary
-    1:1:java.util.List getPackageObfuscationDictionary():623:623 -> getPackageObfuscationDictionary
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():523:523 -> getPackageObfuscationMode
-    1:1:java.lang.String getPackagePrefix():527:527 -> getPackagePrefix
-    1:1:java.lang.String getParsedConfiguration():507:507 -> getParsedConfiguration
-    1:1:java.nio.file.Path getPrintConfigurationFile():571:571 -> getPrintConfigurationFile
-    1:1:java.nio.file.Path getPrintMappingFile():539:539 -> getPrintMappingFile
-    1:1:java.nio.file.Path getPrintUsageFile():579:579 -> getPrintUsageFile
-    1:1:java.lang.String getRenameSourceFileAttribute():587:587 -> getRenameSourceFileAttribute
-    1:1:java.util.List getRules():607:607 -> getRules
-    1:1:java.nio.file.Path getSeedFile():651:651 -> getSeedFile
-    1:1:boolean hasApplyMappingFile():543:543 -> hasApplyMappingFile
-    1:1:boolean hasDontUseMixedCaseClassnames():659:659 -> hasDontUseMixedCaseClassnames
-    1:1:boolean isAccessModificationAllowed():531:531 -> isAccessModificationAllowed
-    1:1:boolean isConfigurationDebugging():655:655 -> isConfigurationDebugging
-    1:1:boolean isIgnoreWarnings():551:551 -> isIgnoreWarnings
-    1:1:boolean isKeepParameterNames():627:627 -> isKeepParameterNames
-    1:1:boolean isObfuscating():559:559 -> isObfuscating
-    1:1:boolean isOptimizing():555:555 -> isOptimizing
-    1:1:boolean isOverloadAggressively():611:611 -> isOverloadAggressively
-    1:1:boolean isPrintConfiguration():567:567 -> isPrintConfiguration
-    1:1:boolean isPrintMapping():535:535 -> isPrintMapping
-    1:1:boolean isPrintSeeds():647:647 -> isPrintSeeds
-    1:1:boolean isPrintUsage():575:575 -> isPrintUsage
-    1:1:boolean isShrinking():563:563 -> isShrinking
-    1:1:boolean isVerbose():583:583 -> isVerbose
-    1:10:java.lang.String toString():664:673 -> toString
+    1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,boolean,boolean,int,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardConfiguration$1):20:20 -> <init>
+    2:42:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,boolean,boolean,int,com.android.tools.r8.shaking.ProguardKeepRule):477:517 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):525:525 -> builder
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():653:653 -> getAdaptClassStrings
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():661:661 -> getAdaptResourceFileContents
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():657:657 -> getAdaptResourceFilenames
+    1:1:java.nio.file.Path getApplyMappingFile():569:569 -> getApplyMappingFile
+    1:1:java.util.List getClassObfuscationDictionary():641:641 -> getClassObfuscationDictionary
+    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():533:533 -> getDexItemFactory
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontNotePatterns():625:625 -> getDontNotePatterns
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns():621:621 -> getDontWarnPatterns
+    1:1:java.util.List getInjars():537:537 -> getInjars
+    1:1:com.android.tools.r8.shaking.ProguardKeepRule getKeepAllRule():689:689 -> getKeepAllRule
+    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():613:613 -> getKeepAttributes
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():665:665 -> getKeepDirectories
+    1:1:com.android.tools.r8.shaking.ProguardPackageNameList getKeepPackageNamesPatterns():617:617 -> getKeepPackageNamesPatterns
+    1:1:java.util.List getLibraryjars():541:541 -> getLibraryjars
+    1:1:int getMaxRemovedAndroidLogLevel():685:685 -> getMaxRemovedAndroidLogLevel
+    1:1:java.util.List getObfuscationDictionary():637:637 -> getObfuscationDictionary
+    1:1:java.util.List getPackageObfuscationDictionary():645:645 -> getPackageObfuscationDictionary
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():545:545 -> getPackageObfuscationMode
+    1:1:java.lang.String getPackagePrefix():549:549 -> getPackagePrefix
+    1:1:java.lang.String getParsedConfiguration():529:529 -> getParsedConfiguration
+    1:1:java.nio.file.Path getPrintConfigurationFile():593:593 -> getPrintConfigurationFile
+    1:1:java.nio.file.Path getPrintMappingFile():561:561 -> getPrintMappingFile
+    1:1:java.nio.file.Path getPrintUsageFile():601:601 -> getPrintUsageFile
+    1:1:java.lang.String getRenameSourceFileAttribute():609:609 -> getRenameSourceFileAttribute
+    1:1:java.util.List getRules():629:629 -> getRules
+    1:1:java.nio.file.Path getSeedFile():673:673 -> getSeedFile
+    1:1:boolean hasApplyMappingFile():565:565 -> hasApplyMappingFile
+    1:1:boolean hasDontUseMixedCaseClassnames():681:681 -> hasDontUseMixedCaseClassnames
+    1:1:boolean isAccessModificationAllowed():553:553 -> isAccessModificationAllowed
+    1:1:boolean isConfigurationDebugging():677:677 -> isConfigurationDebugging
+    1:1:boolean isIgnoreWarnings():573:573 -> isIgnoreWarnings
+    1:1:boolean isKeepParameterNames():649:649 -> isKeepParameterNames
+    1:1:boolean isObfuscating():581:581 -> isObfuscating
+    1:1:boolean isOptimizing():577:577 -> isOptimizing
+    1:1:boolean isOverloadAggressively():633:633 -> isOverloadAggressively
+    1:1:boolean isPrintConfiguration():589:589 -> isPrintConfiguration
+    1:1:boolean isPrintMapping():557:557 -> isPrintMapping
+    1:1:boolean isPrintSeeds():669:669 -> isPrintSeeds
+    1:1:boolean isPrintUsage():597:597 -> isPrintUsage
+    1:1:boolean isShrinking():585:585 -> isShrinking
+    1:1:boolean isVerbose():605:605 -> isVerbose
+    1:10:java.lang.String toString():694:703 -> toString
 com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.shaking.ProguardConfiguration$Builder:
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22:22 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):74:74 -> <init>
-    3:55:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):24:76 -> <init>
-    1:1:java.lang.String[] lambda$synthesizeKeepRulesForRecompilation$0(int):305:305 -> a
-    2:4:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):366:368 -> a
-    1:1:void addAdaptClassStringsPattern(com.android.tools.r8.shaking.ProguardClassNameList):248:248 -> addAdaptClassStringsPattern
-    1:1:void addAdaptResourceFileContents(com.android.tools.r8.shaking.ProguardPathList):256:256 -> addAdaptResourceFileContents
-    1:1:void addAdaptResourceFilenames(com.android.tools.r8.shaking.ProguardPathList):252:252 -> addAdaptResourceFilenames
-    1:1:void addDontNotePattern(com.android.tools.r8.shaking.ProguardClassNameList):200:200 -> addDontNotePattern
-    1:1:void addDontWarnPattern(com.android.tools.r8.shaking.ProguardClassNameList):196:196 -> addDontWarnPattern
-    1:1:void addInjars(java.util.List):84:84 -> addInjars
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder addKeepAttributePatterns(java.util.List):183:183 -> addKeepAttributePatterns
-    1:1:void addKeepDirectories(com.android.tools.r8.shaking.ProguardPathList):264:264 -> addKeepDirectories
-    1:1:void addKeepPackageNamesPattern(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):192:192 -> addKeepPackageNamesPattern
-    1:1:void addLibraryJars(java.util.List):88:88 -> addLibraryJars
-    1:1:void addParsedConfiguration(java.lang.String):80:80 -> addParsedConfiguration
-    1:1:void addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> addRule
-    1:20:com.android.tools.r8.shaking.ProguardConfiguration build():357:376 -> build
-    1:42:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():310:351 -> buildRaw
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableObfuscation():119:119 -> disableObfuscation
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableOptimization():114:114 -> disableOptimization
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableShrinking():136:136 -> disableShrinking
-    1:1:void enableKeepDirectories():260:260 -> enableKeepDirectories
-    1:1:void enableKeepRuleSynthesisForRecompilation():276:276 -> enableKeepRuleSynthesisForRecompilation
-    1:1:com.android.tools.r8.origin.Origin getKeepParameterNamesOptionOrigin():240:240 -> getKeepParameterNamesOptionOrigin
-    1:1:com.android.tools.r8.position.Position getKeepParameterNamesOptionPosition():244:244 -> getKeepParameterNamesOptionPosition
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():92:92 -> getPackageObfuscationMode
-    1:1:boolean hasApplyMappingFile():171:171 -> hasApplyMappingFile
-    1:1:boolean isConfigurationDebugging():284:284 -> isConfigurationDebugging
-    1:1:boolean isKeepParameterNames():236:236 -> isKeepParameterNames
-    1:1:boolean isObfuscating():124:124 -> isObfuscating
-    1:1:boolean isOptimizing():128:128 -> isOptimizing
-    1:1:boolean isOverloadAggressively():224:224 -> isOverloadAggressively
-    1:1:boolean isShrinking():132:132 -> isShrinking
-    1:1:void setAllowAccessModification(boolean):106:106 -> setAllowAccessModification
-    1:1:void setApplyMappingFile(java.nio.file.Path):167:167 -> setApplyMappingFile
-    1:1:void setClassObfuscationDictionary(java.nio.file.Path):216:216 -> setClassObfuscationDictionary
-    1:1:void setConfigurationDebugging(boolean):280:280 -> setConfigurationDebugging
-    1:1:void setDontUseMixedCaseClassnames(boolean):288:288 -> setDontUseMixedCaseClassnames
-    1:2:void setFlattenPackagePrefix(java.lang.String):101:102 -> setFlattenPackagePrefix
-    1:1:void setForceProguardCompatibility(boolean):268:268 -> setForceProguardCompatibility
-    1:1:void setIgnoreWarnings(boolean):110:110 -> setIgnoreWarnings
-    1:4:void setKeepParameterNames(boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):229:232 -> setKeepParameterNames
-    1:1:void setObfuscationDictionary(java.nio.file.Path):212:212 -> setObfuscationDictionary
-    1:1:void setOverloadAggressively(boolean):272:272 -> setOverloadAggressively
-    1:1:void setPackageObfuscationDictionary(java.nio.file.Path):220:220 -> setPackageObfuscationDictionary
-    1:2:void setPackagePrefix(java.lang.String):96:97 -> setPackagePrefix
-    1:1:void setPrintConfiguration(boolean):141:141 -> setPrintConfiguration
-    1:2:void setPrintConfigurationFile(java.nio.file.Path):145:146 -> setPrintConfigurationFile
-    1:1:void setPrintMapping(boolean):158:158 -> setPrintMapping
-    1:2:void setPrintMappingFile(java.nio.file.Path):162:163 -> setPrintMappingFile
-    1:1:void setPrintSeeds(boolean):208:208 -> setPrintSeeds
-    1:1:void setPrintUsage(boolean):150:150 -> setPrintUsage
-    1:1:void setPrintUsageFile(java.nio.file.Path):154:154 -> setPrintUsageFile
-    1:1:void setRenameSourceFileAttribute(java.lang.String):179:179 -> setRenameSourceFileAttribute
-    1:1:void setSeedFile(java.nio.file.Path):204:204 -> setSeedFile
-    1:1:void setVerbose(boolean):175:175 -> setVerbose
-    1:10:void synthesizeKeepRulesForRecompilation():296:305 -> synthesizeKeepRulesForRecompilation
-    11:11:void synthesizeKeepRulesForRecompilation():302:302 -> synthesizeKeepRulesForRecompilation
-    12:12:void synthesizeKeepRulesForRecompilation():301:301 -> synthesizeKeepRulesForRecompilation
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):76:76 -> <init>
+    3:57:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):24:78 -> <init>
+    1:1:java.lang.String[] lambda$synthesizeKeepRulesForRecompilation$0(int):315:315 -> a
+    2:4:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):380:382 -> a
+    1:1:void addAdaptClassStringsPattern(com.android.tools.r8.shaking.ProguardClassNameList):250:250 -> addAdaptClassStringsPattern
+    1:1:void addAdaptResourceFileContents(com.android.tools.r8.shaking.ProguardPathList):258:258 -> addAdaptResourceFileContents
+    1:1:void addAdaptResourceFilenames(com.android.tools.r8.shaking.ProguardPathList):254:254 -> addAdaptResourceFilenames
+    1:1:void addDontNotePattern(com.android.tools.r8.shaking.ProguardClassNameList):202:202 -> addDontNotePattern
+    1:1:void addDontWarnPattern(com.android.tools.r8.shaking.ProguardClassNameList):198:198 -> addDontWarnPattern
+    1:1:void addInjars(java.util.List):86:86 -> addInjars
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder addKeepAttributePatterns(java.util.List):185:185 -> addKeepAttributePatterns
+    1:1:void addKeepDirectories(com.android.tools.r8.shaking.ProguardPathList):266:266 -> addKeepDirectories
+    1:1:void addKeepPackageNamesPattern(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):194:194 -> addKeepPackageNamesPattern
+    1:1:void addLibraryJars(java.util.List):90:90 -> addLibraryJars
+    1:1:void addParsedConfiguration(java.lang.String):82:82 -> addParsedConfiguration
+    1:1:void addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):190:190 -> addRule
+    1:24:com.android.tools.r8.shaking.ProguardConfiguration build():369:392 -> build
+    1:44:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():320:363 -> buildRaw
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableObfuscation():121:121 -> disableObfuscation
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableOptimization():116:116 -> disableOptimization
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableShrinking():138:138 -> disableShrinking
+    1:1:void enableKeepDirectories():262:262 -> enableKeepDirectories
+    1:1:void enableKeepRuleSynthesisForRecompilation():278:278 -> enableKeepRuleSynthesisForRecompilation
+    1:1:com.android.tools.r8.origin.Origin getKeepParameterNamesOptionOrigin():242:242 -> getKeepParameterNamesOptionOrigin
+    1:1:com.android.tools.r8.position.Position getKeepParameterNamesOptionPosition():246:246 -> getKeepParameterNamesOptionPosition
+    1:1:int getMaxRemovedAndroidLogLevel():294:294 -> getMaxRemovedAndroidLogLevel
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():94:94 -> getPackageObfuscationMode
+    1:1:boolean hasApplyMappingFile():173:173 -> hasApplyMappingFile
+    1:1:boolean isConfigurationDebugging():286:286 -> isConfigurationDebugging
+    1:1:boolean isKeepParameterNames():238:238 -> isKeepParameterNames
+    1:1:boolean isObfuscating():126:126 -> isObfuscating
+    1:1:boolean isOptimizing():130:130 -> isOptimizing
+    1:1:boolean isOverloadAggressively():226:226 -> isOverloadAggressively
+    1:1:boolean isShrinking():134:134 -> isShrinking
+    1:1:void setAllowAccessModification(boolean):108:108 -> setAllowAccessModification
+    1:1:void setApplyMappingFile(java.nio.file.Path):169:169 -> setApplyMappingFile
+    1:1:void setClassObfuscationDictionary(java.nio.file.Path):218:218 -> setClassObfuscationDictionary
+    1:1:void setConfigurationDebugging(boolean):282:282 -> setConfigurationDebugging
+    1:1:void setDontUseMixedCaseClassnames(boolean):290:290 -> setDontUseMixedCaseClassnames
+    1:2:void setFlattenPackagePrefix(java.lang.String):103:104 -> setFlattenPackagePrefix
+    1:1:void setForceProguardCompatibility(boolean):270:270 -> setForceProguardCompatibility
+    1:1:void setIgnoreWarnings(boolean):112:112 -> setIgnoreWarnings
+    1:4:void setKeepParameterNames(boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):231:234 -> setKeepParameterNames
+    1:1:void setMaxRemovedAndroidLogLevel(int):298:298 -> setMaxRemovedAndroidLogLevel
+    1:1:void setObfuscationDictionary(java.nio.file.Path):214:214 -> setObfuscationDictionary
+    1:1:void setOverloadAggressively(boolean):274:274 -> setOverloadAggressively
+    1:1:void setPackageObfuscationDictionary(java.nio.file.Path):222:222 -> setPackageObfuscationDictionary
+    1:2:void setPackagePrefix(java.lang.String):98:99 -> setPackagePrefix
+    1:1:void setPrintConfiguration(boolean):143:143 -> setPrintConfiguration
+    1:2:void setPrintConfigurationFile(java.nio.file.Path):147:148 -> setPrintConfigurationFile
+    1:1:void setPrintMapping(boolean):160:160 -> setPrintMapping
+    1:2:void setPrintMappingFile(java.nio.file.Path):164:165 -> setPrintMappingFile
+    1:1:void setPrintSeeds(boolean):210:210 -> setPrintSeeds
+    1:1:void setPrintUsage(boolean):152:152 -> setPrintUsage
+    1:1:void setPrintUsageFile(java.nio.file.Path):156:156 -> setPrintUsageFile
+    1:1:void setRenameSourceFileAttribute(java.lang.String):181:181 -> setRenameSourceFileAttribute
+    1:1:void setSeedFile(java.nio.file.Path):206:206 -> setSeedFile
+    1:1:void setVerbose(boolean):177:177 -> setVerbose
+    1:10:void synthesizeKeepRulesForRecompilation():306:315 -> synthesizeKeepRulesForRecompilation
+    11:11:void synthesizeKeepRulesForRecompilation():312:312 -> synthesizeKeepRulesForRecompilation
+    12:12:void synthesizeKeepRulesForRecompilation():311:311 -> synthesizeKeepRulesForRecompilation
 com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.shaking.ProguardConfigurationParser:
     1:51:void <clinit>():55:105 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109:109 -> <init>
@@ -59021,24 +58983,24 @@
     1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():154:155 -> getConfig
     1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():163:164 -> getConfigRawForTesting
     1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():122:122 -> getConfigurationBuilder
-    1:7:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2042:2048 -> getTextSourceSnippet
+    1:7:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2086:2092 -> getTextSourceSnippet
     1:1:void parse(java.nio.file.Path):168:168 -> parse
     2:2:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):172:172 -> parse
     3:10:void parse(java.util.List):176:183 -> parse
-    11:12:void parse(java.util.List):180:181 -> parse
-    13:19:void parse(java.util.List):180:186 -> parse
+    11:13:void parse(java.util.List):180:180 -> parse
+    19:19:void parse(java.util.List):186:186 -> parse
     1:7:void validate():126:132 -> validate
     8:10:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> validate
     8:10:void validate():129 -> validate
     11:22:void validate():134:145 -> validate
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards:
-    1:3:void <init>(java.lang.String,java.util.List):2056:2058 -> <init>
-    1:2:boolean hasBackreference():2070:2071 -> hasBackreference
-    1:15:boolean hasUnusualCharacters():2075:2089 -> hasUnusualCharacters
-    1:1:boolean isMatchAllNames():2066:2066 -> isMatchAllNames
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2062:2062 -> withoutWildcards
+    1:3:void <init>(java.lang.String,java.util.List):2100:2102 -> <init>
+    1:2:boolean hasBackreference():2114:2115 -> hasBackreference
+    1:15:boolean hasUnusualCharacters():2119:2133 -> hasUnusualCharacters
+    1:1:boolean isMatchAllNames():2110:2110 -> isMatchAllNames
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2106:2106 -> withoutWildcards
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation:
-    1:3:void <init>(java.lang.String,java.util.List,boolean):2100:2102 -> <init>
+    1:3:void <init>(java.lang.String,java.util.List,boolean):2144:2146 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType:
     1:3:void <clinit>():190:192 -> <clinit>
     4:4:void <clinit>():189:189 -> <clinit>
@@ -59048,219 +59010,218 @@
 com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser:
     1:1:void <clinit>():195:195 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):205:205 -> <init>
-    2:1408:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):198:1604 -> <init>
-    1409:1412:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):207:210 -> <init>
-    1:4:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1353:1356 -> a
-    5:5:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1579:1579 -> a
-    6:9:boolean lambda$acceptPattern$7(java.lang.Integer):1804:1807 -> a
-    1:7:boolean acceptArobaseInclude():543:549 -> acceptArobaseInclude
-    1:2:boolean acceptChar(char):1513:1514 -> acceptChar
-    1:1:java.lang.String acceptClassName():1612:1612 -> acceptClassName
-    1:22:java.lang.String acceptFieldNameOrIntegerForReturn():1744:1765 -> acceptFieldNameOrIntegerForReturn
-    1:6:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1617:1622 -> acceptIdentifierWithBackreference
-    7:33:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1627:1653 -> acceptIdentifierWithBackreference
-    34:35:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1648:1649 -> acceptIdentifierWithBackreference
+    2:1452:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):198:1648 -> <init>
+    1453:1456:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):207:210 -> <init>
+    1:4:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1397:1400 -> a
+    5:5:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1623:1623 -> a
+    6:9:boolean lambda$acceptPattern$7(java.lang.Integer):1848:1851 -> a
+    1:7:boolean acceptArobaseInclude():565:571 -> acceptArobaseInclude
+    1:2:boolean acceptChar(char):1557:1558 -> acceptChar
+    1:1:java.lang.String acceptClassName():1656:1656 -> acceptClassName
+    1:22:java.lang.String acceptFieldNameOrIntegerForReturn():1788:1809 -> acceptFieldNameOrIntegerForReturn
+    1:6:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1661:1666 -> acceptIdentifierWithBackreference
+    7:33:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1671:1697 -> acceptIdentifierWithBackreference
+    34:35:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1692:1693 -> acceptIdentifierWithBackreference
     36:38:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    36:38:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1648 -> acceptIdentifierWithBackreference
-    39:41:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1656:1658 -> acceptIdentifierWithBackreference
+    36:38:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1692 -> acceptIdentifierWithBackreference
+    39:41:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1700:1702 -> acceptIdentifierWithBackreference
     42:44:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    42:44:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1656 -> acceptIdentifierWithBackreference
-    45:51:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1662:1668 -> acceptIdentifierWithBackreference
+    42:44:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1700 -> acceptIdentifierWithBackreference
+    45:51:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1706:1712 -> acceptIdentifierWithBackreference
     52:54:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    52:54:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1667 -> acceptIdentifierWithBackreference
-    55:98:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1679:1722 -> acceptIdentifierWithBackreference
+    52:54:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1711 -> acceptIdentifierWithBackreference
+    55:98:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1723:1766 -> acceptIdentifierWithBackreference
     99:101:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    99:101:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1718 -> acceptIdentifierWithBackreference
-    102:102:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1712:1712 -> acceptIdentifierWithBackreference
-    103:130:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1707:1734 -> acceptIdentifierWithBackreference
+    99:101:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1762 -> acceptIdentifierWithBackreference
+    102:102:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1756:1756 -> acceptIdentifierWithBackreference
+    103:130:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1751:1778 -> acceptIdentifierWithBackreference
     131:133:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    131:133:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1733 -> acceptIdentifierWithBackreference
-    134:135:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1739:1740 -> acceptIdentifierWithBackreference
-    1:5:java.lang.Integer acceptInteger():1587:1591 -> acceptInteger
-    1:1:java.lang.String acceptPattern():1802:1802 -> acceptPattern
-    1:28:java.util.List acceptPatternList():1769:1796 -> acceptPatternList
-    1:1:char acceptQuoteIfPresent():1522:1522 -> acceptQuoteIfPresent
-    1:4:java.lang.String acceptQuotedOrUnquotedString():1578:1581 -> acceptQuotedOrUnquotedString
-    1:9:boolean acceptString(java.lang.String):1561:1569 -> acceptString
-    10:10:java.lang.String acceptString():1574:1574 -> acceptString
-    11:25:java.lang.String acceptString(java.util.function.Predicate):1811:1825 -> acceptString
-    1:1:boolean lambda$acceptString$3(java.lang.Integer):1574:1574 -> b
-    1:7:boolean lambda$new$5(java.lang.Integer):1596:1602 -> c
-    1:10:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1266:1275 -> checkConstructorPattern
-    11:11:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1272:1272 -> checkConstructorPattern
-    1:4:boolean lambda$new$6(java.lang.Integer):1606:1609 -> d
-    1:2:boolean lambda$parseFileFilter$2(java.lang.Integer):1411:1412 -> e
-    1:1:boolean eof():1487:1487 -> eof
-    2:2:boolean eof(int):1491:1491 -> eof
-    1:2:void expectChar(char):1555:1556 -> expectChar
-    1:5:void expectClosingQuote(char):1526:1530 -> expectClosingQuote
-    6:6:void expectClosingQuote(char):1528:1528 -> expectClosingQuote
-    1:1:boolean lambda$skipOptimizationName$0(java.lang.Integer):635:635 -> f
-    1:1:int getColumn():2031:2031 -> getColumn
-    1:4:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2019:2022 -> getPosition
-    5:5:com.android.tools.r8.position.TextPosition getPosition():2027:2027 -> getPosition
-    1:2:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2035:2036 -> getSourceSnippet
-    1:4:boolean hasNextChar(char):1495:1498 -> hasNextChar
-    5:8:boolean hasNextChar(java.util.function.Predicate):1502:1505 -> hasNextChar
-    1:2:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2014:2015 -> infoIgnoringModifier
-    3:3:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2014:2014 -> infoIgnoringModifier
-    1:2:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1989:1990 -> infoIgnoringOptions
-    3:3:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1989:1989 -> infoIgnoringOptions
-    1:2:boolean isInteger(java.lang.String):1478:1479 -> isInteger
-    1:1:boolean isOptionalArgumentGiven():1509:1509 -> isOptionalArgumentGiven
+    131:133:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1777 -> acceptIdentifierWithBackreference
+    134:135:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1783:1784 -> acceptIdentifierWithBackreference
+    1:5:java.lang.Integer acceptInteger():1631:1635 -> acceptInteger
+    1:1:java.lang.String acceptPattern():1846:1846 -> acceptPattern
+    1:28:java.util.List acceptPatternList():1813:1840 -> acceptPatternList
+    1:1:char acceptQuoteIfPresent():1566:1566 -> acceptQuoteIfPresent
+    1:4:java.lang.String acceptQuotedOrUnquotedString():1622:1625 -> acceptQuotedOrUnquotedString
+    1:9:boolean acceptString(java.lang.String):1605:1613 -> acceptString
+    10:10:java.lang.String acceptString():1618:1618 -> acceptString
+    11:25:java.lang.String acceptString(java.util.function.Predicate):1855:1869 -> acceptString
+    1:1:boolean lambda$acceptString$3(java.lang.Integer):1618:1618 -> b
+    1:7:boolean lambda$new$5(java.lang.Integer):1640:1646 -> c
+    1:10:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1310:1319 -> checkConstructorPattern
+    11:11:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1316:1316 -> checkConstructorPattern
+    1:4:boolean lambda$new$6(java.lang.Integer):1650:1653 -> d
+    1:2:boolean lambda$parseFileFilter$2(java.lang.Integer):1455:1456 -> e
+    1:1:boolean eof():1531:1531 -> eof
+    2:2:boolean eof(int):1535:1535 -> eof
+    1:2:void expectChar(char):1599:1600 -> expectChar
+    1:5:void expectClosingQuote(char):1570:1574 -> expectClosingQuote
+    6:6:void expectClosingQuote(char):1572:1572 -> expectClosingQuote
+    1:1:boolean lambda$skipOptimizationName$0(java.lang.Integer):657:657 -> f
+    1:1:int getColumn():2075:2075 -> getColumn
+    1:4:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2063:2066 -> getPosition
+    5:5:com.android.tools.r8.position.TextPosition getPosition():2071:2071 -> getPosition
+    1:2:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2079:2080 -> getSourceSnippet
+    1:4:boolean hasNextChar(char):1539:1542 -> hasNextChar
+    5:8:boolean hasNextChar(java.util.function.Predicate):1546:1549 -> hasNextChar
+    1:3:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2058:2058 -> infoIgnoringModifier
+    1:3:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2033:2033 -> infoIgnoringOptions
+    1:2:boolean isInteger(java.lang.String):1522:1523 -> isInteger
+    1:1:boolean isOptionalArgumentGiven():1553:1553 -> isOptionalArgumentGiven
     1:6:void parse():215:220 -> parse
     7:12:void parse():219:224 -> parse
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():909:921 -> parseAnnotation
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():920:920 -> parseAnnotation
-    1:12:java.util.List parseArgumentList():1281:1292 -> parseArgumentList
-    13:22:java.util.List parseArgumentList():1289:1298 -> parseArgumentList
-    23:25:java.util.List parseArgumentList():1297:1299 -> parseArgumentList
-    26:33:java.util.List parseArgumentList():1296:1303 -> parseArgumentList
-    1:6:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1434:1439 -> parseAssumeMayHaveSideEffectsRule
-    1:8:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1421:1428 -> parseAssumeNoSideEffectsRule
-    1:8:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1444:1451 -> parseAssumeValuesRule
-    1:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):686:693 -> parseCheckDiscardRule
-    1:6:void parseClassFilter(java.util.function.Consumer):1857:1862 -> parseClassFilter
-    7:7:void parseClassFilter(java.util.function.Consumer):1861:1861 -> parseClassFilter
-    1:23:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):934:956 -> parseClassFlagsAndAnnotations
-    1:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):699:704 -> parseClassInlineRule
-    1:6:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):710:715 -> parseClassMergingRule
-    1:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1889:1891 -> parseClassName
-    4:7:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1896:1899 -> parseClassName
-    1:4:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1868:1871 -> parseClassNameAddToBuilder
-    5:8:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1869:1872 -> parseClassNameAddToBuilder
-    1:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1876:1880 -> parseClassNames
-    1:10:java.util.List parseClassPath():1373:1382 -> parseClassPath
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1388:1401 -> parseClassPathFilters
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1398:1403 -> parseClassPathFilters
-    1:5:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):842:846 -> parseClassSpec
-    1:20:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):969:988 -> parseClassType
-    1:2:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):964:965 -> parseClassTypeUnexpected
-    1:6:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):783:788 -> parseConstantArgumentRule
-    1:1:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1969:1969 -> parseError
-    2:2:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,java.lang.Throwable):1973:1973 -> parseError
-    3:4:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1979:1980 -> parseError
-    5:6:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1984:1985 -> parseError
-    1:7:java.lang.String parseFileFilter():1408:1414 -> parseFileFilter
-    1:22:java.nio.file.Path parseFileName(boolean):1343:1364 -> parseFileName
-    23:30:java.nio.file.Path parseFileName(boolean):1362:1369 -> parseFileName
-    31:31:java.nio.file.Path parseFileName(boolean):1358:1358 -> parseFileName
-    32:32:java.nio.file.Path parseFileName(boolean):1347:1347 -> parseFileName
-    1:8:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):746:753 -> parseIdentifierNameStringRule
-    1:20:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):758:777 -> parseIfRule
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():953:965 -> parseAnnotation
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():964:964 -> parseAnnotation
+    1:12:java.util.List parseArgumentList():1325:1336 -> parseArgumentList
+    13:22:java.util.List parseArgumentList():1333:1342 -> parseArgumentList
+    23:25:java.util.List parseArgumentList():1341:1343 -> parseArgumentList
+    26:33:java.util.List parseArgumentList():1340:1347 -> parseArgumentList
+    1:6:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1478:1483 -> parseAssumeMayHaveSideEffectsRule
+    1:8:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1465:1472 -> parseAssumeNoSideEffectsRule
+    1:8:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1488:1495 -> parseAssumeValuesRule
+    1:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):708:715 -> parseCheckDiscardRule
+    1:6:void parseClassFilter(java.util.function.Consumer):1901:1906 -> parseClassFilter
+    7:7:void parseClassFilter(java.util.function.Consumer):1905:1905 -> parseClassFilter
+    1:23:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):978:1000 -> parseClassFlagsAndAnnotations
+    1:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):721:726 -> parseClassInlineRule
+    1:6:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):732:737 -> parseClassMergingRule
+    1:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1933:1935 -> parseClassName
+    4:7:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1940:1943 -> parseClassName
+    1:4:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1912:1915 -> parseClassNameAddToBuilder
+    5:8:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1913:1916 -> parseClassNameAddToBuilder
+    1:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1920:1924 -> parseClassNames
+    1:10:java.util.List parseClassPath():1417:1426 -> parseClassPath
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1432:1445 -> parseClassPathFilters
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1442:1447 -> parseClassPathFilters
+    1:5:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):886:890 -> parseClassSpec
+    1:20:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1013:1032 -> parseClassType
+    1:2:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1008:1009 -> parseClassTypeUnexpected
+    1:6:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):805:810 -> parseConstantArgumentRule
+    1:1:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2013:2013 -> parseError
+    2:2:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,java.lang.Throwable):2017:2017 -> parseError
+    3:4:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2023:2024 -> parseError
+    5:6:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2028:2029 -> parseError
+    1:7:java.lang.String parseFileFilter():1452:1458 -> parseFileFilter
+    1:22:java.nio.file.Path parseFileName(boolean):1387:1408 -> parseFileName
+    23:30:java.nio.file.Path parseFileName(boolean):1406:1413 -> parseFileName
+    31:31:java.nio.file.Path parseFileName(boolean):1402:1402 -> parseFileName
+    32:32:java.nio.file.Path parseFileName(boolean):1391:1391 -> parseFileName
+    1:8:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):768:775 -> parseIdentifierNameStringRule
+    1:20:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):780:799 -> parseIfRule
     21:23:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> parseIfRule
-    21:23:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):776 -> parseIfRule
-    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):519:521 -> parseIgnoredOption
-    4:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):520:524 -> parseIgnoredOption
-    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):499:506 -> parseIgnoredOptionAndWarn
-    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):505:513 -> parseIgnoredOptionAndWarn
-    1:10:void parseInclude():528:537 -> parseInclude
-    11:11:void parseInclude():534:534 -> parseInclude
-    1:11:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):994:1004 -> parseInheritance
-    12:12:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1003:1003 -> parseInheritance
-    1:9:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):732:740 -> parseInlineRule
-    1:5:void parseKeepAttributes():554:558 -> parseKeepAttributes
-    6:6:void parseKeepAttributes():556:556 -> parseKeepAttributes
-    1:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):651:661 -> parseKeepRule
-    12:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):660:669 -> parseKeepRule
-    1:50:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1036:1085 -> parseMemberAccessFlags
-    51:68:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1073:1090 -> parseMemberAccessFlags
-    69:74:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1064:1069 -> parseMemberAccessFlags
-    75:76:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1059:1060 -> parseMemberAccessFlags
-    77:78:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1054:1055 -> parseMemberAccessFlags
-    79:80:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1049:1050 -> parseMemberAccessFlags
-    81:137:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1044:1100 -> parseMemberAccessFlags
-    1:46:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1108:1153 -> parseMemberPattern
-    47:63:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1148:1164 -> parseMemberPattern
-    64:86:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1159:1181 -> parseMemberPattern
-    87:101:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1180:1194 -> parseMemberPattern
-    102:134:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1193:1225 -> parseMemberPattern
-    135:135:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1224:1224 -> parseMemberPattern
-    136:148:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1222:1234 -> parseMemberPattern
-    149:149:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1233:1233 -> parseMemberPattern
-    150:155:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1232:1237 -> parseMemberPattern
-    156:179:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1236:1259 -> parseMemberPattern
-    1:6:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1026:1031 -> parseMemberRule
-    1:8:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1013:1020 -> parseMemberRules
-    1:6:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):722:727 -> parseMemberValuePropagationRule
-    1:2:boolean parseNegation():927:928 -> parseNegation
-    1:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):615:623 -> parseOptimizationOption
+    21:23:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):798 -> parseIfRule
+    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):541:543 -> parseIgnoredOption
+    4:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):542:546 -> parseIgnoredOption
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):521:528 -> parseIgnoredOptionAndWarn
+    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):527:535 -> parseIgnoredOptionAndWarn
+    1:10:void parseInclude():550:559 -> parseInclude
+    11:11:void parseInclude():556:556 -> parseInclude
+    1:11:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1038:1048 -> parseInheritance
+    12:12:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1047:1047 -> parseInheritance
+    1:9:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):754:762 -> parseInlineRule
+    1:5:void parseKeepAttributes():576:580 -> parseKeepAttributes
+    6:6:void parseKeepAttributes():578:578 -> parseKeepAttributes
+    1:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):673:683 -> parseKeepRule
+    12:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):682:691 -> parseKeepRule
+    1:50:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1080:1129 -> parseMemberAccessFlags
+    51:68:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1117:1134 -> parseMemberAccessFlags
+    69:74:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1108:1113 -> parseMemberAccessFlags
+    75:76:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1103:1104 -> parseMemberAccessFlags
+    77:78:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1098:1099 -> parseMemberAccessFlags
+    79:80:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1093:1094 -> parseMemberAccessFlags
+    81:137:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1088:1144 -> parseMemberAccessFlags
+    1:46:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1152:1197 -> parseMemberPattern
+    47:63:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1192:1208 -> parseMemberPattern
+    64:86:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1203:1225 -> parseMemberPattern
+    87:101:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1224:1238 -> parseMemberPattern
+    102:134:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1237:1269 -> parseMemberPattern
+    135:135:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1268:1268 -> parseMemberPattern
+    136:148:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1266:1278 -> parseMemberPattern
+    149:149:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1277:1277 -> parseMemberPattern
+    150:155:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1276:1281 -> parseMemberPattern
+    156:179:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1280:1303 -> parseMemberPattern
+    1:6:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1070:1075 -> parseMemberRule
+    1:8:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1057:1064 -> parseMemberRules
+    1:6:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):744:749 -> parseMemberValuePropagationRule
+    1:2:boolean parseNegation():971:972 -> parseNegation
+    1:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):637:645 -> parseOptimizationOption
     1:51:boolean parseOption():228:278 -> parseOption
     52:53:boolean parseOption():275:276 -> parseOption
     54:56:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> parseOption
     54:56:boolean parseOption():275 -> parseOption
     57:139:boolean parseOption():279:361 -> parseOption
-    140:189:boolean parseOption():360:409 -> parseOption
-    1:10:void parsePackageFilter(java.util.function.BiConsumer):1838:1847 -> parsePackageFilter
-    11:14:void parsePackageFilter(java.util.function.BiConsumer):1846:1849 -> parsePackageFilter
-    15:22:void parsePackageFilter(java.util.function.BiConsumer):1844:1851 -> parsePackageFilter
-    1:1:java.lang.String parsePackageNameOrEmptyString():1884:1884 -> parsePackageNameOrEmptyString
-    1:5:void parsePathFilter(java.util.function.Consumer):1910:1914 -> parsePathFilter
-    6:25:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1919:1938 -> parsePathFilter
-    26:31:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1935:1940 -> parsePathFilter
-    32:32:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1925:1925 -> parsePathFilter
-    1:18:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):887:904 -> parseRuleModifiers
-    1:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):850:883 -> parseRuleTypeAndModifiers
-    1:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):416:469 -> parseTestingOption
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):488:491 -> parseUnsupportedOptionAndErr
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):490:490 -> parseUnsupportedOptionAndErr
-    1:6:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):794:799 -> parseUnusedArgumentRule
-    1:8:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):674:681 -> parseWhyAreYouKeepingRule
-    1:6:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):805:810 -> parseWhyAreYouNotInliningRule
-    1:1:boolean pathFilterMatcher(java.lang.Integer):1905:1905 -> pathFilterMatcher
-    1:1:char peekChar():1538:1538 -> peekChar
-    1:2:char peekCharAt(int):1542:1543 -> peekCharAt
-    1:1:char readChar():1547:1547 -> readChar
-    1:1:int remainingChars():1551:1551 -> remainingChars
-    1:21:java.lang.String replaceSystemPropertyReferences(java.lang.String):1309:1329 -> replaceSystemPropertyReferences
-    22:34:java.lang.String replaceSystemPropertyReferences(java.lang.String):1327:1339 -> replaceSystemPropertyReferences
-    1:8:void skipComment():1466:1473 -> skipComment
-    1:3:boolean skipFlag(java.lang.String):562:564 -> skipFlag
-    1:11:void skipOptimizationName():628:638 -> skipOptimizationName
-    1:10:boolean skipOptionWithClassSpec(java.lang.String):597:606 -> skipOptionWithClassSpec
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):583:589 -> skipOptionWithOptionalSingleArg
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):572:576 -> skipOptionWithSingleArg
-    1:3:void skipSingleArgument():643:645 -> skipSingleArgument
-    1:8:void skipWhitespace():1455:1462 -> skipWhitespace
-    1:10:java.lang.String snippetForPosition():1945:1954 -> snippetForPosition
-    11:17:java.lang.String snippetForPosition():1950:1956 -> snippetForPosition
-    18:21:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1961:1964 -> snippetForPosition
-    1:4:void unacceptString(java.lang.String):1829:1832 -> unacceptString
-    1:1:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):477:477 -> unknownOption
-    2:4:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):482:484 -> unknownOption
+    140:197:boolean parseOption():360:417 -> parseOption
+    1:10:void parsePackageFilter(java.util.function.BiConsumer):1882:1891 -> parsePackageFilter
+    11:14:void parsePackageFilter(java.util.function.BiConsumer):1890:1893 -> parsePackageFilter
+    15:22:void parsePackageFilter(java.util.function.BiConsumer):1888:1895 -> parsePackageFilter
+    1:1:java.lang.String parsePackageNameOrEmptyString():1928:1928 -> parsePackageNameOrEmptyString
+    1:5:void parsePathFilter(java.util.function.Consumer):1954:1958 -> parsePathFilter
+    6:25:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1963:1982 -> parsePathFilter
+    26:31:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1979:1984 -> parsePathFilter
+    32:32:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1969:1969 -> parsePathFilter
+    1:6:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.position.Position):827:832 -> parseReprocessClassInitializerRule
+    1:6:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):838:843 -> parseReprocessMethodRule
+    1:18:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):931:948 -> parseRuleModifiers
+    1:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):894:927 -> parseRuleTypeAndModifiers
+    1:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424:477 -> parseTestingOption
+    55:65:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):476:486 -> parseTestingOption
+    66:72:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):485:491 -> parseTestingOption
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):510:513 -> parseUnsupportedOptionAndErr
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):512:512 -> parseUnsupportedOptionAndErr
+    1:6:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):816:821 -> parseUnusedArgumentRule
+    1:8:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):696:703 -> parseWhyAreYouKeepingRule
+    1:6:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):849:854 -> parseWhyAreYouNotInliningRule
+    1:1:boolean pathFilterMatcher(java.lang.Integer):1949:1949 -> pathFilterMatcher
+    1:1:char peekChar():1582:1582 -> peekChar
+    1:2:char peekCharAt(int):1586:1587 -> peekCharAt
+    1:1:char readChar():1591:1591 -> readChar
+    1:1:int remainingChars():1595:1595 -> remainingChars
+    1:21:java.lang.String replaceSystemPropertyReferences(java.lang.String):1353:1373 -> replaceSystemPropertyReferences
+    22:34:java.lang.String replaceSystemPropertyReferences(java.lang.String):1371:1383 -> replaceSystemPropertyReferences
+    1:8:void skipComment():1510:1517 -> skipComment
+    1:3:boolean skipFlag(java.lang.String):584:586 -> skipFlag
+    1:11:void skipOptimizationName():650:660 -> skipOptimizationName
+    1:10:boolean skipOptionWithClassSpec(java.lang.String):619:628 -> skipOptionWithClassSpec
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):605:611 -> skipOptionWithOptionalSingleArg
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):594:598 -> skipOptionWithSingleArg
+    1:3:void skipSingleArgument():665:667 -> skipSingleArgument
+    1:8:void skipWhitespace():1499:1506 -> skipWhitespace
+    1:10:java.lang.String snippetForPosition():1989:1998 -> snippetForPosition
+    11:17:java.lang.String snippetForPosition():1994:2000 -> snippetForPosition
+    18:21:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):2005:2008 -> snippetForPosition
+    1:4:void unacceptString(java.lang.String):1873:1876 -> unacceptString
+    1:1:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):499:499 -> unknownOption
+    2:4:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):504:506 -> unknownOption
     5:7:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> unknownOption
-    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):482 -> unknownOption
-    1:13:void verifyAndLinkBackReferences(java.lang.Iterable):814:826 -> verifyAndLinkBackReferences
-    14:17:void verifyAndLinkBackReferences(java.lang.Iterable):821:824 -> verifyAndLinkBackReferences
+    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):504 -> unknownOption
+    1:13:void verifyAndLinkBackReferences(java.lang.Iterable):858:870 -> verifyAndLinkBackReferences
+    14:17:void verifyAndLinkBackReferences(java.lang.Iterable):865:868 -> verifyAndLinkBackReferences
     18:20:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> verifyAndLinkBackReferences
-    18:20:void verifyAndLinkBackReferences(java.lang.Iterable):821 -> verifyAndLinkBackReferences
-    21:23:void verifyAndLinkBackReferences(java.lang.Iterable):828:830 -> verifyAndLinkBackReferences
-    1:2:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1994:1995 -> warnIgnoringOptions
-    3:3:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1994:1994 -> warnIgnoringOptions
-    1:2:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1999:2000 -> warnOverridingOptions
-    3:3:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1999:1999 -> warnOverridingOptions
-    1:6:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2005:2010 -> warnUnusualCharacters
-    7:7:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2005:2005 -> warnUnusualCharacters
+    18:20:void verifyAndLinkBackReferences(java.lang.Iterable):865 -> verifyAndLinkBackReferences
+    21:23:void verifyAndLinkBackReferences(java.lang.Iterable):872:874 -> verifyAndLinkBackReferences
+    1:3:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2038:2038 -> warnIgnoringOptions
+    1:3:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2043:2043 -> warnOverridingOptions
+    1:7:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2049:2049 -> warnUnusualCharacters
 com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.ProguardConfigurationRule:
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):39:39 -> <init>
     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):23:23 -> <init>
-    1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):107:107 -> a
-    1:5:java.lang.StringBuilder append(java.lang.StringBuilder,boolean):142:146 -> append
-    1:14:boolean equals(java.lang.Object):115:128 -> equals
-    1:12:java.lang.Iterable getWildcards():98:109 -> getWildcards
+    1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):115:115 -> a
+    1:5:java.lang.StringBuilder append(java.lang.StringBuilder,boolean):150:154 -> append
+    1:14:boolean equals(java.lang.Object):123:136 -> equals
+    1:12:java.lang.Iterable getWildcards():106:117 -> getWildcards
     13:13:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable[]):487:487 -> getWildcards
-    13:13:java.lang.Iterable getWildcards():99 -> getWildcards
-    1:5:int hashCode():133:137 -> hashCode
+    13:13:java.lang.Iterable getWildcards():107 -> getWildcards
+    1:5:int hashCode():141:145 -> hashCode
     1:1:boolean isUsed():45:45 -> isUsed
     1:1:void markAsUsed():49:49 -> markAsUsed
-    1:5:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):70:74 -> relevantCandidatesForRule
+    1:5:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):78:82 -> relevantCandidatesForRule
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> relevantCandidatesForRule
-    6:6:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):75 -> relevantCandidatesForRule
-    7:10:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):76:79 -> relevantCandidatesForRule
+    6:6:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):83 -> relevantCandidatesForRule
+    7:10:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):84:87 -> relevantCandidatesForRule
     11:11:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> relevantCandidatesForRule
-    11:11:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):77 -> relevantCandidatesForRule
-    12:12:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):81:81 -> relevantCandidatesForRule
+    11:11:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):85 -> relevantCandidatesForRule
+    12:12:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):89:89 -> relevantCandidatesForRule
 com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.shaking.ProguardConfigurationSourceBytes:
     1:3:void <init>(byte[],com.android.tools.r8.origin.Origin):18:20 -> <init>
     4:4:void <init>(java.io.InputStream,com.android.tools.r8.origin.Origin):24:24 -> <init>
@@ -59318,8 +59279,8 @@
 com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.shaking.ProguardIfRule:
     1:2:void <clinit>():18:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRule,java.util.Set,com.android.tools.r8.shaking.ProguardIfRule$1):16:16 -> <init>
-    2: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.ProguardKeepRule,java.util.Set):88:91 -> <init>
-    6:11:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRule,java.util.Set):88:93 -> <init>
+    2:6:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRule,java.util.Set):88:88 -> <init>
+    10:11:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRule,java.util.Set):92:93 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardMemberRule lambda$materialize$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardMemberRule):127:127 -> a
     2:2:boolean lambda$neverInlineRuleForCondition$1(com.android.tools.r8.shaking.ProguardMemberRule):199:199 -> a
     1:1:com.android.tools.r8.shaking.ProguardMemberRule lambda$neverInlineRuleForCondition$2(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardMemberRule):200:200 -> b
@@ -59429,53 +59390,53 @@
     1:1:void <clinit>():16:16 -> <clinit>
 com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.shaking.ProguardMemberRule:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardMemberType,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardNameMatcher,java.util.List,com.android.tools.r8.shaking.ProguardMemberRuleReturnValue,com.android.tools.r8.shaking.ProguardMemberRule$1):22:22 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardMemberType,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardNameMatcher,java.util.List,com.android.tools.r8.shaking.ProguardMemberRuleReturnValue):114:122 -> <init>
-    1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):297:297 -> a
-    2:2:com.android.tools.r8.shaking.ProguardTypeMatcher lambda$materialize$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher):314:314 -> a
-    1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder builder():129:129 -> builder
-    1:3:com.android.tools.r8.shaking.ProguardMemberRule defaultKeepAllRule():407:409 -> defaultKeepAllRule
-    1:25:boolean equals(java.lang.Object):321:345 -> equals
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getAccessFlags():137:137 -> getAccessFlags
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getAnnotation():133:133 -> getAnnotation
-    1:1:java.util.List getArguments():157:157 -> getArguments
-    1:1:com.android.tools.r8.shaking.ProguardNameMatcher getName():153:153 -> getName
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():141:141 -> getNegatedAccessFlags
-    1:1:com.android.tools.r8.shaking.ProguardMemberRuleReturnValue getReturnValue():165:165 -> getReturnValue
-    1:1:com.android.tools.r8.shaking.ProguardMemberType getRuleType():145:145 -> getRuleType
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getType():149:149 -> getType
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():169:169 -> getTypeMatcher
-    1:10:java.lang.Iterable getWildcards():290:299 -> getWildcards
+    2:10:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardMemberType,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardNameMatcher,java.util.List,com.android.tools.r8.shaking.ProguardMemberRuleReturnValue):115:123 -> <init>
+    1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):298:298 -> a
+    2:2:com.android.tools.r8.shaking.ProguardTypeMatcher lambda$materialize$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher):315:315 -> a
+    1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder builder():130:130 -> builder
+    1:3:com.android.tools.r8.shaking.ProguardMemberRule defaultKeepAllRule():408:410 -> defaultKeepAllRule
+    1:25:boolean equals(java.lang.Object):322:346 -> equals
+    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getAccessFlags():138:138 -> getAccessFlags
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getAnnotation():134:134 -> getAnnotation
+    1:1:java.util.List getArguments():158:158 -> getArguments
+    1:1:com.android.tools.r8.shaking.ProguardNameMatcher getName():154:154 -> getName
+    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():142:142 -> getNegatedAccessFlags
+    1:1:com.android.tools.r8.shaking.ProguardMemberRuleReturnValue getReturnValue():166:166 -> getReturnValue
+    1:1:com.android.tools.r8.shaking.ProguardMemberType getRuleType():146:146 -> getRuleType
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getType():150:150 -> getType
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():170:170 -> getTypeMatcher
+    1:10:java.lang.Iterable getWildcards():291:300 -> getWildcards
     11:11:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):469:469 -> getWildcards
-    11:11:java.lang.Iterable getWildcards():290 -> getWildcards
-    1:1:boolean hasReturnValue():161:161 -> hasReturnValue
-    1:7:int hashCode():350:356 -> hashCode
-    1:9:boolean isSpecific():277:285 -> isSpecific
-    1:28:boolean matches(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.DexStringCache):173:200 -> matches
-    29:77:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.DexStringCache):215:263 -> matches
-    78:89:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.DexStringCache):218:229 -> matches
-    1:13:com.android.tools.r8.shaking.ProguardMemberRule materialize(com.android.tools.r8.graph.DexItemFactory):304:316 -> materialize
-    1:37:java.lang.String toString():362:398 -> toString
-    38:47:java.lang.String toString():375:384 -> toString
-    48:66:java.lang.String toString():372:390 -> toString
-    67:101:java.lang.String toString():369:403 -> toString
+    11:11:java.lang.Iterable getWildcards():291 -> getWildcards
+    1:1:boolean hasReturnValue():162:162 -> hasReturnValue
+    1:7:int hashCode():351:357 -> hashCode
+    1:9:boolean isSpecific():278:286 -> isSpecific
+    1:28:boolean matches(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.DexStringCache):174:201 -> matches
+    29:77:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.DexStringCache):216:264 -> matches
+    78:89:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.DexStringCache):219:230 -> matches
+    1:13:com.android.tools.r8.shaking.ProguardMemberRule materialize(com.android.tools.r8.graph.DexItemFactory):305:317 -> materialize
+    1:37:java.lang.String toString():363:399 -> toString
+    38:47:java.lang.String toString():376:385 -> toString
+    48:66:java.lang.String toString():373:391 -> toString
+    67:101:java.lang.String toString():370:404 -> toString
 com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.shaking.ProguardMemberRule$1:
-    1:1:void <clinit>():174:174 -> <clinit>
+    1:1:void <clinit>():175:175 -> <clinit>
 com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.shaking.ProguardMemberRule$Builder:
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardMemberRule$1):24:24 -> <init>
     2:2:void <init>():35:35 -> <init>
     3:4:void <init>():27:28 -> <init>
-    1:2:com.android.tools.r8.shaking.ProguardMemberRule build():91:92 -> build
+    1:2:com.android.tools.r8.shaking.ProguardMemberRule build():92:93 -> build
     1:1:com.android.tools.r8.shaking.ProguardAccessFlags getAccessFlags():42:42 -> getAccessFlags
     1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():51:51 -> getNegatedAccessFlags
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():64:64 -> getTypeMatcher
-    1:1:boolean isValid():87:87 -> isValid
+    1:1:boolean isValid():88:88 -> isValid
     1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder setAccessFlags(com.android.tools.r8.shaking.ProguardAccessFlags):46:46 -> setAccessFlags
     1:1:void setAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher):38:38 -> setAnnotation
-    1:1:void setArguments(java.util.List):78:78 -> setArguments
+    1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder setArguments(java.util.List):78:78 -> setArguments
     1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder setName(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):73:73 -> setName
     1:1:void setNegatedAccessFlags(com.android.tools.r8.shaking.ProguardAccessFlags):55:55 -> setNegatedAccessFlags
-    1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder setReturnValue(com.android.tools.r8.shaking.ProguardMemberRuleReturnValue):82:82 -> setReturnValue
+    1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder setReturnValue(com.android.tools.r8.shaking.ProguardMemberRuleReturnValue):83:83 -> setReturnValue
     1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder setRuleType(com.android.tools.r8.shaking.ProguardMemberType):59:59 -> setRuleType
     1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder setTypeMatcher(com.android.tools.r8.shaking.ProguardTypeMatcher):68:68 -> setTypeMatcher
 com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.shaking.ProguardMemberRuleReturnValue:
@@ -59732,193 +59693,223 @@
     2:6:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():56:60 -> materialize
     1:1:void setCaptured(java.lang.String):41:41 -> setCaptured
     1:1:java.lang.String toString():76:76 -> toString
+com.android.tools.r8.shaking.ReprocessClassInitializerRule -> com.android.tools.r8.shaking.ReprocessClassInitializerRule:
+    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.ReprocessClassInitializerRule$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>
+    1:1:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder builder():74:74 -> builder
+com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder -> com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder:
+    1:1:void <init>(com.android.tools.r8.shaking.ReprocessClassInitializerRule$1):12:12 -> <init>
+    2:2:void <init>():16:16 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardClassSpecification build():12:12 -> build
+    2:4:com.android.tools.r8.shaking.ReprocessClassInitializerRule build():26:28 -> build
+    1:1:com.android.tools.r8.shaking.ProguardClassSpecification$Builder self():12:12 -> self
+com.android.tools.r8.shaking.ReprocessMethodRule -> com.android.tools.r8.shaking.ReprocessMethodRule:
+    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.ReprocessMethodRule$Type,com.android.tools.r8.shaking.ReprocessMethodRule$1):11:11 -> <init>
+    2:16: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.ReprocessMethodRule$Type):74:88 -> <init>
+    1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Builder builder():92:92 -> builder
+    1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type getType():96:96 -> getType
+    1:7:java.lang.String typeString():111:117 -> typeString
+com.android.tools.r8.shaking.ReprocessMethodRule$1 -> com.android.tools.r8.shaking.ReprocessMethodRule$1:
+    1:1:void <clinit>():111:111 -> <clinit>
+com.android.tools.r8.shaking.ReprocessMethodRule$Builder -> com.android.tools.r8.shaking.ReprocessMethodRule$Builder:
+    1:1:void <init>(com.android.tools.r8.shaking.ReprocessMethodRule$1):18:18 -> <init>
+    2:2:void <init>():24:24 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardClassSpecification build():18:18 -> build
+    2:4:com.android.tools.r8.shaking.ReprocessMethodRule build():39:41 -> build
+    1:1:com.android.tools.r8.shaking.ProguardClassSpecification$Builder self():18:18 -> self
+    1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Builder setType(com.android.tools.r8.shaking.ReprocessMethodRule$Type):28:28 -> setType
+com.android.tools.r8.shaking.ReprocessMethodRule$Type -> com.android.tools.r8.shaking.ReprocessMethodRule$Type:
+    1:2:void <clinit>():14:15 -> <clinit>
+    3:3:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(java.lang.String,int):13:13 -> <init>
+    1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type valueOf(java.lang.String):13:13 -> valueOf
+    1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type[] values():13:13 -> values
 com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.shaking.RootSetBuilder:
     1:1:void <clinit>():69:69 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):108:108 -> <init>
-    2:40:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):74:112 -> <init>
-    41:41:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection):117:117 -> <init>
-    42:42:void <init>(com.android.tools.r8.graph.AppView):121:121 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):110:110 -> <init>
+    2:42:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):74:114 -> <init>
+    43:43:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection):119:119 -> <init>
+    44:44:void <init>(com.android.tools.r8.graph.AppView):123:123 -> <init>
     boolean lambda$process$0(com.android.tools.r8.graph.DexDefinition) -> a
-    1:6:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263:268 -> a
-    7:8:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):447:448 -> a
-    9:10:void lambda$markMatchingMethods$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):632:633 -> a
-    11:12:void lambda$markMatchingFields$10(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):665:666 -> a
-    13:13:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):823:823 -> a
+    1:6:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):264:269 -> a
+    7:8:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):450:451 -> a
+    9:10:void lambda$markMatchingMethods$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):635:636 -> a
+    11:12:void lambda$markMatchingFields$10(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):668:669 -> a
+    13:13:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):826:826 -> a
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> a
-    14:14:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):823 -> a
-    15:15:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):823:823 -> a
-    16:16:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):1053:1053 -> a
-    17:17:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):1061:1061 -> a
+    14:14:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):826 -> a
+    15:15:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):826:826 -> a
+    16:16:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):1056:1056 -> a
+    17:17:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):1064:1064 -> a
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.RootSetBuilder):69:69 -> access$300
     1:1:com.android.tools.r8.shaking.DexStringCache access$400(com.android.tools.r8.shaking.RootSetBuilder):69:69 -> access$400
     1:1:boolean access$500(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):69:69 -> access$500
     1:1:java.util.Queue access$600(com.android.tools.r8.shaking.RootSetBuilder):69:69 -> access$600
     1:1:com.android.tools.r8.graph.DexDefinition access$700(com.android.tools.r8.graph.DexDefinition,java.util.Map):69:69 -> access$700
     1:1:void access$800(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):69:69 -> access$800
-    1:21:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1000:1020 -> addItemToSets
+    1:21:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1003:1023 -> addItemToSets
     22:22:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> addItemToSets
-    22:22:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1020 -> addItemToSets
-    23:26:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1026:1029 -> addItemToSets
+    22:22:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1023 -> addItemToSets
+    23:26:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1029:1032 -> addItemToSets
     27:27:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> addItemToSets
-    27:27:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1029 -> addItemToSets
-    28:33:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1030:1035 -> addItemToSets
-    34:55:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1032:1053 -> addItemToSets
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> addItemToSets
-    56:56:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1053 -> addItemToSets
-    57:113:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1053:1109 -> addItemToSets
-    114:114:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1103:1103 -> addItemToSets
-    115:133: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):1100:1118 -> addItemToSets
-    134:157: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):1115:1138 -> addItemToSets
-    158:166: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):1132:1140 -> addItemToSets
-    167:195:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1123:1151 -> addItemToSets
-    196:240: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):1149:1193 -> addItemToSets
-    1:2:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):829:830 -> allRulesSatisfied
-    1:26:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):787:812 -> anyImplementedInterfaceMatchesImplementsRule
-    1:6:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):819:824 -> anySourceMatchesInheritanceRuleDirectly
-    1:13:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):755:767 -> anySuperTypeMatchesExtendsRule
-    1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):175:175 -> b
-    2:3:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):455:456 -> b
-    4:5:void lambda$markMatchingOverriddenMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):617:618 -> b
-    6:7:void lambda$markMatchingVisibleFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):650:651 -> b
-    8:8:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):1062:1062 -> b
-    1:9:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():394:402 -> buildConsequentRootSet
+    27:27:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1032 -> addItemToSets
+    28:33:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1033:1038 -> addItemToSets
+    34:55:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1035:1056 -> addItemToSets
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> addItemToSets
+    56:56:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1056 -> addItemToSets
+    57:113:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1056:1112 -> addItemToSets
+    114:114:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1106:1106 -> addItemToSets
+    115:133: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):1103:1121 -> addItemToSets
+    134:157: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):1118:1141 -> addItemToSets
+    158:166: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):1135:1143 -> addItemToSets
+    167:195: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):1126:1154 -> addItemToSets
+    196:251: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):1152:1207 -> addItemToSets
+    252:268: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):1201:1217 -> addItemToSets
+    1:2:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):832:833 -> allRulesSatisfied
+    1:26:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):790:815 -> anyImplementedInterfaceMatchesImplementsRule
+    1:6:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):822:827 -> anySourceMatchesInheritanceRuleDirectly
+    1:13:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):758:770 -> anySuperTypeMatchesExtendsRule
+    1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):177:177 -> b
+    2:3:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):458:459 -> b
+    4:5:void lambda$markMatchingOverriddenMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):620:621 -> b
+    6:7:void lambda$markMatchingVisibleFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):653:654 -> b
+    8:8:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):1065:1065 -> b
+    1:9:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():397:405 -> buildConsequentRootSet
     boolean lambda$process$2(com.android.tools.r8.graph.DexDefinition) -> c
-    1:1:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1065:1065 -> c
-    1:1:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):584:584 -> canInsertForwardingMethod
+    1:1:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1068:1068 -> c
+    1:1:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):587:587 -> canInsertForwardingMethod
     2:3:boolean com.android.tools.r8.utils.ArrayUtils.contains(java.lang.Object[],java.lang.Object):110:111 -> canInsertForwardingMethod
-    2:3:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):585 -> canInsertForwardingMethod
-    1:1:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):871:871 -> containsAnnotation
-    2:6:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):875:879 -> containsAnnotation
-    7:7:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):887:887 -> containsAnnotation
-    8:12:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):895:899 -> containsAnnotation
+    2:3:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):588 -> canInsertForwardingMethod
+    1:1:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):874:874 -> containsAnnotation
+    2:6:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):878:882 -> containsAnnotation
+    7:7:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):890:890 -> containsAnnotation
+    8:12:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):898:902 -> containsAnnotation
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$18(com.android.tools.r8.graph.DexReference) -> d
     boolean lambda$process$3(com.android.tools.r8.graph.DexDefinition) -> d
     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):972:972 -> f
-    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):973:973 -> g
-    1:10:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):957:966 -> includeDescriptor
+    1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):975:975 -> f
+    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):976:976 -> g
+    1:10:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):960:969 -> includeDescriptor
     11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> includeDescriptor
-    11:11:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):966 -> includeDescriptor
-    12:21:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):967:976 -> includeDescriptor
-    1:11:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):980:990 -> includeDescriptorClasses
-    1:2:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):950:951 -> markClass
+    11:11:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):969 -> includeDescriptor
+    12:21:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):970:979 -> includeDescriptor
+    1:11:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):983:993 -> includeDescriptorClasses
+    1:2:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):953:954 -> markClass
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markClass
-    3:3:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):951 -> markClass
-    4:4:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):953:953 -> markClass
-    1:4:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):938:941 -> markField
+    3:3:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):954 -> markClass
+    4:4:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):956:956 -> markClass
+    1:4:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):941:944 -> markField
     5:5:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markField
-    5:5:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):941 -> markField
-    6:6:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):944:944 -> markField
-    1:1:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):663:663 -> markMatchingFields
-    1:1:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):630:630 -> markMatchingMethods
-    1:11:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):596:606 -> markMatchingOverriddenMethods
+    5:5:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):944 -> markField
+    6:6:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):947:947 -> markField
+    1:1:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):666:666 -> markMatchingFields
+    1:1:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):633:633 -> markMatchingMethods
+    1:11:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):599:609 -> markMatchingOverriddenMethods
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> markMatchingOverriddenMethods
-    12:12:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):606 -> markMatchingOverriddenMethods
-    13:23:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):610:620 -> 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):645:653 -> markMatchingVisibleFields
-    1:40: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):433:472 -> markMatchingVisibleMethods
-    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):914:921 -> markMethod
+    12:12:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):609 -> markMatchingOverriddenMethods
+    13:23:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):613:623 -> 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):648:656 -> markMatchingVisibleFields
+    1:40: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):436:475 -> markMatchingVisibleMethods
+    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):917:924 -> 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):921 -> 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):925:927 -> markMethod
-    1:59:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):129:187 -> process
-    60:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):164:183 -> process
-    80:158:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):157:235 -> process
-    159:159:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):224:224 -> process
-    160:162:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):212:214 -> process
-    163:165:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):213:215 -> process
-    166:166:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):194:194 -> process
-    1:12:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):337:348 -> propagateAssumeRules
-    13:44:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):358:389 -> propagateAssumeRules
-    1:4:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):842:845 -> ruleSatisfied
-    1:3:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):860:862 -> ruleSatisfiedByFields
-    1:3:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):849:851 -> ruleSatisfiedByMethods
-    1:33:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):275:307 -> run
-    34:61:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):306:333 -> run
-    62:62:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):291:291 -> run
-    1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):245:260 -> runPerRule
-    17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):259:259 -> runPerRule
-    1:2:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):728:729 -> satisfyAccessFlag
-    1:1:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):733:733 -> satisfyAnnotation
-    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):724:724 -> satisfyClassType
-    1:6:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):745:750 -> satisfyExtendsRule
-    1:6:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):773:778 -> satisfyImplementsRule
-    1:5:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):737:741 -> satisfyInheritanceRule
-    1:10:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):412:421 -> testAndGetPrecondition
-    1:14:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):673:686 -> writeSeeds
-    15:40:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):681:706 -> writeSeeds
-    41:56:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):705:720 -> writeSeeds
+    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):924 -> 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):928:930 -> markMethod
+    1:59:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):131:189 -> process
+    60:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):166:185 -> process
+    80:157:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):159:236 -> process
+    158:159:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):227:228 -> process
+    160:160:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):223:223 -> process
+    161:163:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):214:216 -> process
+    164:166:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):215:217 -> process
+    167:167:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):196:196 -> process
+    1:12:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):340:351 -> propagateAssumeRules
+    13:44:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):361:392 -> propagateAssumeRules
+    1:4:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):845:848 -> ruleSatisfied
+    1:3:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):863:865 -> ruleSatisfiedByFields
+    1:3:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):852:854 -> ruleSatisfiedByMethods
+    1:33:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):276:308 -> run
+    34:63:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):307:336 -> run
+    64:64:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):292:292 -> run
+    1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):246:261 -> runPerRule
+    17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):260:260 -> runPerRule
+    1:2:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):731:732 -> satisfyAccessFlag
+    1:1:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):736:736 -> satisfyAnnotation
+    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):727:727 -> satisfyClassType
+    1:6:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):748:753 -> satisfyExtendsRule
+    1:6:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):776:781 -> satisfyImplementsRule
+    1:5:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):740:744 -> satisfyInheritanceRule
+    1:10:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):415:424 -> testAndGetPrecondition
+    1:14:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):676:689 -> writeSeeds
+    15:40:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):684:709 -> writeSeeds
+    41:56:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):708:723 -> writeSeeds
 com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.shaking.RootSetBuilder$1:
-    1:1:void <clinit>():1153:1153 -> <clinit>
-    2:2:void <clinit>():1142:1142 -> <clinit>
-    3:3:void <clinit>():1130:1130 -> <clinit>
-    4:4:void <clinit>():1098:1098 -> <clinit>
-    5:5:void <clinit>():154:154 -> <clinit>
+    1:1:void <clinit>():1199:1199 -> <clinit>
+    2:2:void <clinit>():1156:1156 -> <clinit>
+    3:3:void <clinit>():1145:1145 -> <clinit>
+    4:4:void <clinit>():1133:1133 -> <clinit>
+    5:5:void <clinit>():1101:1101 -> <clinit>
+    6:6:void <clinit>():156:156 -> <clinit>
 com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet:
-    1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1583:1583 -> <init>
-    2:10:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.List):1601:1609 -> <init>
+    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,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1610:1610 -> <init>
+    2:10:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.List):1628:1636 -> <init>
 com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.shaking.RootSetBuilder$RootSet:
-    1:1:void <clinit>():1197:1197 -> <clinit>
-    1:1:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1197:1197 -> <init>
-    2:26:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List):1249:1273 -> <init>
+    1:1:void <clinit>():1221:1221 -> <clinit>
+    1:1:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1221:1221 -> <init>
+    2:28:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List):1277:1303 -> <init>
     1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):175:175 -> a
-    1:1:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1352 -> a
-    2:4:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1354:1356 -> a
-    5:5:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexReference):1302:1302 -> a
-    6:6:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexReference,java.util.Set):1302:1302 -> a
-    7:8:void lambda$addConsequentRootSet$3(com.android.tools.r8.graph.DexType,java.util.Set):1307:1308 -> a
-    9:9:java.util.Set lambda$addConsequentRootSet$2(com.android.tools.r8.graph.DexType):1308:1308 -> a
-    10:11:void lambda$addDependentItems$5(com.android.tools.r8.graph.DexReference,java.util.Map):1318:1319 -> a
-    12:12:void lambda$toString$9(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1575:1575 -> a
-    1:14:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1296:1309 -> addConsequentRootSet
-    1:1:void addDependentItems(java.util.Map):1315:1315 -> addDependentItems
+    1:1:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1379 -> a
+    2:4:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1381:1383 -> a
+    5:5:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexReference):1329:1329 -> a
+    6:6:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexReference,java.util.Set):1329:1329 -> a
+    7:8:void lambda$addConsequentRootSet$3(com.android.tools.r8.graph.DexType,java.util.Set):1334:1335 -> a
+    9:9:java.util.Set lambda$addConsequentRootSet$2(com.android.tools.r8.graph.DexType):1335:1335 -> a
+    10:11:void lambda$addDependentItems$5(com.android.tools.r8.graph.DexReference,java.util.Map):1345:1346 -> a
+    12:12:void lambda$toString$9(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1602:1602 -> a
+    1:14:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1323:1336 -> addConsequentRootSet
+    1:1:void addDependentItems(java.util.Map):1342:1342 -> addDependentItems
     1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):175:175 -> b
-    1:1:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1338 -> b
-    2:3:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1339:1340 -> b
-    4:4:java.util.Map lambda$addDependentItems$4(com.android.tools.r8.graph.DexReference):1318:1318 -> b
-    5:5:java.util.Set lambda$verifyKeptItemsAreKept$8(com.android.tools.r8.graph.DexType):1495:1495 -> b
-    1:12:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1277:1288 -> checkAllRulesAreUsed
-    13:13:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1285:1285 -> checkAllRulesAreUsed
-    14:16:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> checkAllRulesAreUsed
-    14:16:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1285 -> checkAllRulesAreUsed
-    1:14:void copy(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1362:1375 -> copy
-    1:2:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1349:1350 -> forEachDependentNonStaticMember
-    1:2:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1335:1336 -> forEachDependentStaticMember
-    1:2:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1327:1328 -> getDependentItems
-    3:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1327:1327 -> getDependentItems
-    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1323:1323 -> getDependentKeepClassCompatRule
-    1:9:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1462:1470 -> isKeptDirectlyOrIndirectly
-    1:1:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1397:1397 -> mayBeMinified
-    1:3:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1401:1403 -> mayNotBeMinified
-    4:8:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1402:1406 -> mayNotBeMinified
-    9:14:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1405:1410 -> mayNotBeMinified
-    15:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1409:1409 -> mayNotBeMinified
-    1:2:void move(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1388:1389 -> move
-    1:5:void prune(com.android.tools.r8.graph.DexReference):1380:1384 -> prune
-    1:1:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1393:1393 -> shouldNotBeMinified
-    1:21:java.lang.String toString():1557:1577 -> toString
-    1:4:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1415:1418 -> verifyKeptFieldsAreAccessedAndLive
+    1:1:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1365 -> b
+    2:3:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1366:1367 -> b
+    4:4:java.util.Map lambda$addDependentItems$4(com.android.tools.r8.graph.DexReference):1345:1345 -> b
+    5:5:java.util.Set lambda$verifyKeptItemsAreKept$8(com.android.tools.r8.graph.DexType):1522:1522 -> b
+    1:9:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1307:1315 -> checkAllRulesAreUsed
+    1:14:void copy(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1389:1402 -> copy
+    1:2:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1376:1377 -> forEachDependentNonStaticMember
+    1:2:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1362:1363 -> forEachDependentStaticMember
+    1:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1354:1354 -> getDependentItems
+    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1350:1350 -> getDependentKeepClassCompatRule
+    1:9:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1489:1497 -> isKeptDirectlyOrIndirectly
+    1:1:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1424:1424 -> mayBeMinified
+    1:3:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1428:1430 -> mayNotBeMinified
+    4:8:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1429:1433 -> mayNotBeMinified
+    9:14:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1432:1437 -> mayNotBeMinified
+    15:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1436:1436 -> mayNotBeMinified
+    1:2:void move(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1415:1416 -> move
+    1:5:void prune(com.android.tools.r8.graph.DexReference):1407:1411 -> prune
+    1:1:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1420:1420 -> shouldNotBeMinified
+    1:21:java.lang.String toString():1584:1604 -> toString
+    1:4:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1442:1445 -> verifyKeptFieldsAreAccessedAndLive
     5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> verifyKeptFieldsAreAccessedAndLive
-    5:5:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1420 -> verifyKeptFieldsAreAccessedAndLive
-    6:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1420:1424 -> verifyKeptFieldsAreAccessedAndLive
-    1:73:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1477:1549 -> verifyKeptItemsAreKept
-    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1432:1442 -> verifyKeptMethodsAreTargetedAndLive
-    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1451:1455 -> verifyKeptTypesAreLive
+    5:5:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1447 -> verifyKeptFieldsAreAccessedAndLive
+    6:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1447:1451 -> verifyKeptFieldsAreAccessedAndLive
+    1:73:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1504:1576 -> verifyKeptItemsAreKept
+    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1459:1469 -> verifyKeptMethodsAreTargetedAndLive
+    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1478:1482 -> verifyKeptTypesAreLive
 com.android.tools.r8.shaking.RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules:
-    1:1:void <clinit>():481:481 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.RootSetBuilder$1):481:481 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):495:495 -> <init>
-    3:18:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):487:502 -> <init>
-    1:3:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):567:569 -> a
+    1:1:void <clinit>():484:484 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.RootSetBuilder$1):484:484 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):498:498 -> <init>
+    3:18:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):490:505 -> <init>
+    1:3:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):570:572 -> a
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    4:4:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):568 -> a
-    5:7:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):575:577 -> a
-    1:1:void run():506:506 -> run
-    1:24:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):539:562 -> tryAndKeepMethodOnClass
-    1:1:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):510:510 -> visitAllSuperInterfaces
+    4:4:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):571 -> a
+    5:7:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):578:580 -> a
+    1:1:void run():509:509 -> run
+    1:24:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):542:565 -> tryAndKeepMethodOnClass
+    1:1:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):513:513 -> visitAllSuperInterfaces
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> visitAllSuperInterfaces
-    2:2:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):510 -> visitAllSuperInterfaces
-    3:24:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):511:532 -> visitAllSuperInterfaces
+    2:2:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):513 -> visitAllSuperInterfaces
+    3:24:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):514:535 -> visitAllSuperInterfaces
 com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.ScopedDexMethodSet:
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():28:28 -> <init>
@@ -59975,7 +59966,7 @@
     1:12:com.android.tools.r8.graph.GraphLense run():229:240 -> run
     13:19:com.android.tools.r8.graph.GraphLense run():236:242 -> run
     1:41:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):262:302 -> satisfiesMergeCriteria
-    42:42:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):786:786 -> satisfiesMergeCriteria
+    42:42:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):791:791 -> 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
@@ -59984,8 +59975,8 @@
 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:
-    1:5:void <clinit>():61:65 -> <clinit>
-    6:16:void <clinit>():61:71 -> <clinit>
+    1:6:void <clinit>():61:61 -> <clinit>
+    13:16:void <clinit>():68:71 -> <clinit>
     1:1:void <init>(java.lang.String,int):61:61 -> <init>
     1:9:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():113:121 -> globalKey
     10:10:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():119:119 -> globalKey
@@ -60048,7 +60039,7 @@
     31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1168:1168 -> reachableMethods
     31:31:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):280 -> reachableMethods
     32:57:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):280:305 -> reachableMethods
-    58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> reachableMethods
+    58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():349:349 -> reachableMethods
     58:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):753 -> reachableMethods
     58:58:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):305 -> reachableMethods
     59:60:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):754:755 -> reachableMethods
@@ -60082,207 +60073,203 @@
 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>():88:88 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):219:219 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):192:231 -> <init>
-    1:1:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):423:423 -> a
-    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$000
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$100(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$100
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1000
-    1:1:void access$1100(com.android.tools.r8.graph.DexEncodedMethod):88:88 -> access$1100
-    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1200(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1200
-    1:1:java.util.Map 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:com.android.tools.r8.graph.DexApplication access$1500(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1500
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1600(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1600
-    1:1:java.util.List access$1700(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1700
-    1:1:java.util.Collection access$1800(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1800
-    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$200
-    1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$800
-    1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$900
-    1:17:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1631:1647 -> disallowInlining
-    18:26:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1646:1654 -> disallowInlining
-    1:18:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):281:298 -> extractPinnedItems
-    1:18:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):835:852 -> fieldResolutionMayChange
-    1:4:java.util.Collection getInvokes():519:522 -> getInvokes
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses getMergedClasses():235:235 -> getMergedClasses
-    1:1:java.util.Collection getRemovedClasses():1953:1953 -> getRemovedClasses
-    1:3:void initializeMergeCandidates(java.lang.Iterable):239:241 -> initializeMergeCandidates
-    1:26:void initializePinnedTypes(java.lang.Iterable):251:276 -> initializePinnedTypes
-    1:9:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):327:335 -> isMergeCandidate
+    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):220:220 -> <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):193:232 -> <init>
+    1:1:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):424:424 -> a
+    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$000
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$100(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$100
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1000
+    1:1:void access$1100(com.android.tools.r8.graph.DexEncodedMethod):89:89 -> access$1100
+    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1200(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1200
+    1:1:java.util.Map 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:com.android.tools.r8.graph.DexApplication access$1500(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1500
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1600(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1600
+    1:1:java.util.List access$1700(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1700
+    1:1:java.util.Collection access$1800(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1800
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$200
+    1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$800
+    1:1:com.android.tools.r8.utils.Timing 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):1638:1654 -> disallowInlining
+    18:26:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1653:1661 -> disallowInlining
+    1:18:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):282:299 -> extractPinnedItems
+    1:18:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):836:853 -> fieldResolutionMayChange
+    1:4:java.util.Collection getInvokes():520:523 -> getInvokes
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses getMergedClasses():236:236 -> getMergedClasses
+    1:1:java.util.Collection getRemovedClasses():1960:1960 -> getRemovedClasses
+    1:3:void initializeMergeCandidates(java.lang.Iterable):240:242 -> initializeMergeCandidates
+    1:26:void initializePinnedTypes(java.lang.Iterable):252:277 -> initializePinnedTypes
+    1:9:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):328:336 -> 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):335 -> isMergeCandidate
-    11:13:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):335:337 -> isMergeCandidate
-    14:71:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):335:392 -> isMergeCandidate
+    10:10:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):336 -> isMergeCandidate
+    11:14:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):336:336 -> isMergeCandidate
+    18:71:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):340:393 -> isMergeCandidate
     72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> isMergeCandidate
-    72:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):392 -> isMergeCandidate
-    73:75:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:397 -> isMergeCandidate
-    76:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387:388 -> isMergeCandidate
-    1:17:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):408:424 -> isStillMergeCandidate
-    18:18:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):786:786 -> isStillMergeCandidate
-    18:18:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):424 -> isStillMergeCandidate
-    19:53:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):431:465 -> isStillMergeCandidate
-    54:55:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):444:445 -> isStillMergeCandidate
-    56:57:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):426:427 -> isStillMergeCandidate
-    1:4:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1413:1416 -> makePrivate
-    1:14:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):305:318 -> markTypeAsPinned
-    1:66:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):758:823 -> mergeClassIfPossible
-    67:77:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):819:829 -> mergeClassIfPossible
-    78:78:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):825:825 -> mergeClassIfPossible
-    79:79:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):810:810 -> mergeClassIfPossible
-    1:38:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):473:510 -> mergeMayLeadToIllegalAccesses
-    1:46:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):701:746 -> methodResolutionMayChange
-    1:16:com.android.tools.r8.graph.GraphLense run():617:632 -> run
-    17:22:com.android.tools.r8.graph.GraphLense run():628:633 -> run
-    1:57:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):638:694 -> verifyGraphLense
+    72:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):393 -> isMergeCandidate
+    73:75:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):396:398 -> isMergeCandidate
+    76:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):388:389 -> isMergeCandidate
+    1:17:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):409:425 -> isStillMergeCandidate
+    18:18:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):791:791 -> isStillMergeCandidate
+    18:18:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):425 -> isStillMergeCandidate
+    19:53:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):432:466 -> isStillMergeCandidate
+    54:55:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):445:446 -> isStillMergeCandidate
+    56:57:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):427:428 -> isStillMergeCandidate
+    1:4:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1420:1423 -> makePrivate
+    1:14:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):306:319 -> markTypeAsPinned
+    1:66:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):759:824 -> mergeClassIfPossible
+    67:77:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):820:830 -> mergeClassIfPossible
+    78:78:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):826:826 -> mergeClassIfPossible
+    79:79:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):811:811 -> mergeClassIfPossible
+    1:38:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):474:511 -> mergeMayLeadToIllegalAccesses
+    1:46:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):702:747 -> methodResolutionMayChange
+    1:16:com.android.tools.r8.graph.GraphLense run():618:633 -> run
+    17:22:com.android.tools.r8.graph.GraphLense run():629:634 -> run
+    1:57:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):639:695 -> verifyGraphLense
 com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.shaking.VerticalClassMerger$1:
-    1:1:void <clinit>():1936:1936 -> <clinit>
-    2:2:void <clinit>():1353:1353 -> <clinit>
-    3:3:void <clinit>():116:116 -> <clinit>
+    1:1:void <clinit>():1943:1943 -> <clinit>
+    2:2:void <clinit>():1360:1360 -> <clinit>
+    3:3:void <clinit>():117:117 -> <clinit>
 com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.shaking.VerticalClassMerger$AbortReason:
-    1:19:void <clinit>():90:108 -> <clinit>
-    20:20:void <clinit>():90:90 -> <clinit>
-    1:1:void <init>(java.lang.String,int):90:90 -> <init>
-    1:59:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):116:174 -> getMessageForClass
-    60:60:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):172:172 -> getMessageForClass
-    1:1:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):111:111 -> printLogMessageForClass
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason valueOf(java.lang.String):90:90 -> valueOf
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():90:90 -> values
+    1:20:void <clinit>():91:91 -> <clinit>
+    1:1:void <init>(java.lang.String,int):91:91 -> <init>
+    1:59:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):117:175 -> getMessageForClass
+    60:60:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):173:173 -> getMessageForClass
+    1:1:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):112:112 -> printLogMessageForClass
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason valueOf(java.lang.String):91:91 -> valueOf
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():91:91 -> values
 com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger:
-    1:1:void <clinit>():863:863 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):863:863 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):875:875 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):869:877 -> <init>
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):892:895 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):969:971 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):970:970 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1032:1032 -> a
-    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1076:1076 -> a
-    11:12:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1084:1085 -> a
-    1:1:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1261:1261 -> add
-    1:2:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1266:1267 -> addAll
-    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1089:1090 -> b
-    1:1:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1186:1186 -> blockRedirectionOfSuperCalls
-    1:35:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1191:1225 -> buildBridgeMethod
-    1:1:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1094:1094 -> c
-    1:21:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1232:1252 -> findMethodInTarget
-    22:22:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1247:1247 -> findMethodInTarget
-    1:5:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1304:1308 -> getFreshName
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1099:1099 -> getRenamings
-    1:1:java.util.List getSynthesizedBridges():1103:1103 -> getSynthesizedBridges
-    1:5:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1403:1407 -> makeStatic
-    1:20:boolean merge():884:903 -> merge
-    21:30:boolean merge():900:909 -> merge
-    31:57:boolean merge():906:932 -> merge
-    58:68:boolean merge():931:941 -> merge
-    69:69:boolean com.android.tools.r8.graph.DexClass.isAbstract():626:626 -> merge
-    69:69:boolean merge():941 -> merge
-    70:103:boolean merge():942:975 -> merge
-    104:151:boolean merge():966:1013 -> merge
-    152:177:boolean merge():1012:1037 -> merge
-    178:187:boolean merge():1035:1044 -> merge
-    188:223:boolean merge():1042:1077 -> merge
-    1:3:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1272:1274 -> mergeArrays
-    1:13:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1283:1295 -> mergeFields
-    1:57:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1107:1163 -> redirectSuperCallsInTarget
-    1:20:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1313:1332 -> renameConstructor
-    1:16:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1384:1399 -> 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):1338:1338 -> 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):1348:1376 -> 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):1355:1379 -> renameMethod
-    1:13:boolean restoreDebuggingState(java.util.stream.Stream):1082:1094 -> restoreDebuggingState
-    14:14:boolean restoreDebuggingState(java.util.stream.Stream):1093:1093 -> restoreDebuggingState
+    1:1:void <clinit>():864:864 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):864:864 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):876:876 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):870:878 -> <init>
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):893:896 -> 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):976:978 -> 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):977:977 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1039:1039 -> a
+    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1083:1083 -> a
+    11:12:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1091:1092 -> a
+    1:1:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1268:1268 -> add
+    1:2:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1273:1274 -> addAll
+    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1096:1097 -> b
+    1:1:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1193:1193 -> blockRedirectionOfSuperCalls
+    1:35:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1198:1232 -> buildBridgeMethod
+    1:1:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1101:1101 -> c
+    1:21:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1239:1259 -> findMethodInTarget
+    22:22:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1254:1254 -> findMethodInTarget
+    1:5:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1311:1315 -> getFreshName
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1106:1106 -> getRenamings
+    1:1:java.util.List getSynthesizedBridges():1110:1110 -> getSynthesizedBridges
+    1:5:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1410:1414 -> makeStatic
+    1:26:boolean merge():885:910 -> merge
+    27:59:boolean merge():907:939 -> merge
+    60:70:boolean merge():938:948 -> merge
+    71:71:boolean com.android.tools.r8.graph.DexClass.isAbstract():639:639 -> merge
+    71:71:boolean merge():948 -> merge
+    72:105:boolean merge():949:982 -> merge
+    106:153:boolean merge():973:1020 -> merge
+    154:179:boolean merge():1019:1044 -> merge
+    180:189:boolean merge():1042:1051 -> merge
+    190:225:boolean merge():1049:1084 -> merge
+    1:3:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1279:1281 -> mergeArrays
+    1:13:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1290:1302 -> mergeFields
+    1:57:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1114:1170 -> redirectSuperCallsInTarget
+    1:20:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1320:1339 -> renameConstructor
+    1:16:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1391:1406 -> 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):1345:1345 -> 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):1355:1383 -> 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):1362:1386 -> renameMethod
+    1:13:boolean restoreDebuggingState(java.util.stream.Stream):1089:1101 -> restoreDebuggingState
+    14:14:boolean restoreDebuggingState(java.util.stream.Stream):1100:1100 -> restoreDebuggingState
 com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector:
-    1:1:void <clinit>():1520:1520 -> <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):1520:1520 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1531:1531 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1525:1537 -> <init>
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1574:1575 -> 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):1594:1625 -> computePositionsFor
-    1:18:void fillSeenPositions():1567:1584 -> fillSeenPositions
-    1:22:boolean mayCollide():1541:1562 -> mayCollide
+    1:1:void <clinit>():1527:1527 -> <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):1527:1527 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1538:1538 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1532:1544 -> <init>
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1581:1582 -> 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):1601:1632 -> computePositionsFor
+    1:18:void fillSeenPositions():1574:1591 -> fillSeenPositions
+    1:22:boolean mayCollide():1548:1569 -> mayCollide
 com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector:
-    1:1:void <clinit>():1739:1739 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1748:1748 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1741:1750 -> <init>
-    1:8:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1762:1769 -> checkFieldReference
+    1:1:void <clinit>():1746:1746 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1755:1755 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1748:1757 -> <init>
+    1:8:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1769:1776 -> checkFieldReference
     9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):180:180 -> checkFieldReference
-    9:9:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1769 -> checkFieldReference
-    10:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1770:1771 -> checkFieldReference
-    1:10:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1779:1788 -> checkMethodReference
+    9:9:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1776 -> checkFieldReference
+    10:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1777:1778 -> checkFieldReference
+    1:10:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1786:1795 -> checkMethodReference
     11:11:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):185:185 -> checkMethodReference
-    11:11:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1788 -> checkMethodReference
-    12:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1789:1790 -> checkMethodReference
-    1:5:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1798:1802 -> checkTypeReference
+    11:11:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1795 -> checkMethodReference
+    12:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1796:1797 -> checkMethodReference
+    1:5:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1805:1809 -> checkTypeReference
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> checkTypeReference
-    6:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1802 -> checkTypeReference
-    7:8:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1803:1804 -> checkTypeReference
-    1:1:boolean foundIllegalAccess():1754:1754 -> foundIllegalAccess
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1858:1858 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1853:1853 -> registerInstanceFieldWrite
-    1:4:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1821:1824 -> registerInvokeDirect
-    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1837:1840 -> registerInvokeInterface
-    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1829:1832 -> registerInvokeStatic
-    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1845:1848 -> registerInvokeSuper
-    1:4:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1813:1816 -> registerInvokeVirtual
-    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1863:1863 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1868:1868 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1873:1873 -> registerStaticFieldWrite
-    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1878:1878 -> registerTypeReference
-    1:1:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1758:1758 -> setContext
+    6:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1809 -> checkTypeReference
+    7:8:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1810:1811 -> checkTypeReference
+    1:1:boolean foundIllegalAccess():1761:1761 -> foundIllegalAccess
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1865:1865 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1860:1860 -> registerInstanceFieldWrite
+    1:4:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1828:1831 -> registerInvokeDirect
+    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1844:1847 -> registerInvokeInterface
+    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1836:1839 -> registerInvokeStatic
+    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1852:1855 -> registerInvokeSuper
+    1:4:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1820:1823 -> registerInvokeVirtual
+    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1870:1870 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1875:1875 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1880:1880 -> registerStaticFieldWrite
+    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1885:1885 -> registerTypeReference
+    1:1:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1765:1765 -> 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):533:533 -> <init>
-    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):528:535 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):558:558 -> a
-    1:35:java.util.Collection get():540:574 -> get
-    1:15:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):582:596 -> protoMayReferenceMergedSourceOrTarget
-    1:8:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):602:609 -> typeMayReferenceMergedSourceOrTarget
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):534:534 -> <init>
+    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):529:536 -> <init>
+    1:1:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):559:559 -> a
+    1:35:java.util.Collection get():541:575 -> get
+    1:15:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):583:597 -> protoMayReferenceMergedSourceOrTarget
+    1:8:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):603:610 -> typeMayReferenceMergedSourceOrTarget
 com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.shaking.VerticalClassMerger$Rename:
-    1:3:void <clinit>():179:181 -> <clinit>
-    4:4:void <clinit>():178:178 -> <clinit>
-    1:1:void <init>(java.lang.String,int):178:178 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename valueOf(java.lang.String):178:178 -> valueOf
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():178:178 -> values
+    1:3:void <clinit>():180:182 -> <clinit>
+    4:4:void <clinit>():179:179 -> <clinit>
+    1:1:void <init>(java.lang.String,int):179:179 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename valueOf(java.lang.String):179:179 -> valueOf
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():179:179 -> values
 com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense:
-    1:1:void <clinit>():1657:1657 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1662:1664 -> <init>
-    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1674:1674 -> getOriginalFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1679:1679 -> getOriginalMethodSignature
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1669:1669 -> getOriginalType
-    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1684:1684 -> getRenamedFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1689:1689 -> getRenamedMethodSignature
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1728:1728 -> 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):1701:1718 -> lookupMethod
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1723:1723 -> lookupPrototypeChanges
-    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1694:1694 -> lookupType
+    1:1:void <clinit>():1664:1664 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1669:1671 -> <init>
+    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1681:1681 -> getOriginalFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1686:1686 -> getOriginalMethodSignature
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1676:1676 -> getOriginalType
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1691:1691 -> getRenamedFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1696:1696 -> getRenamedMethodSignature
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1735:1735 -> 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):1708:1725 -> lookupMethod
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1730:1730 -> lookupPrototypeChanges
+    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1701:1701 -> 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):1895:1900 -> <init>
-    1:11:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1936:1946 -> a
-    12:12:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1938:1938 -> a
-    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1882:1882 -> access$500
-    1:1:java.util.function.Consumer getRegistryCallback():1935:1935 -> getRegistryCallback
-    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1921:1930 -> getSourceCodeProvider
-    1:2:void updateMethodSignatures(java.util.function.Function):1915:1916 -> 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):1902:1907 -> <init>
+    1:11:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1943:1953 -> a
+    12:12:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1945:1945 -> a
+    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1889:1889 -> access$500
+    1:1:java.util.function.Consumer getRegistryCallback():1942:1942 -> getRegistryCallback
+    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1928:1937 -> getSourceCodeProvider
+    1:2:void updateMethodSignatures(java.util.function.Function):1922:1923 -> 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):1419:1423 -> <init>
-    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1422:1424 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1419:1419 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense access$400(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1419:1419 -> access$400
-    1:11:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1463:1473 -> fixupFields
-    1:2:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1479:1480 -> fixupMethod
-    3:3:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1479:1479 -> fixupMethod
-    1:9:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1446:1454 -> fixupMethods
-    1:6:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1484:1489 -> fixupProto
-    1:11:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1495:1505 -> fixupType
-    1:11:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1428:1438 -> fixupTypeReferences
-    1:3:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1512:1514 -> fixupTypes
+    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1426:1430 -> <init>
+    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1429:1431 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1426:1426 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense access$400(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1426:1426 -> access$400
+    1:11:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1470:1480 -> fixupFields
+    1:3:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1486:1486 -> fixupMethod
+    1:9:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1453:1461 -> fixupMethods
+    1:6:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1491:1496 -> fixupProto
+    1:11:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1502:1512 -> fixupType
+    1:11:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1435:1445 -> fixupTypeReferences
+    1:3:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1519:1521 -> fixupTypes
 com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.shaking.VerticalClassMergerGraphLense:
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1):47:47 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.GraphLense):74:74 -> <init>
     3:14:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.GraphLense):67:78 -> <init>
-    1:2:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):88:89 -> getOriginalMethodSignature
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):88:88 -> getOriginalMethodSignature
+    1:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):88:88 -> getOriginalMethodSignature
     1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):83:83 -> getOriginalType
     1:7:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):147:153 -> isContextFreeForMethod
     1:1:boolean isContextFreeForMethods():142:142 -> isContextFreeForMethods
@@ -60477,8 +60464,8 @@
     15:15:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):180:180 -> a
     16:16:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):196:196 -> a
     17:17:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):208:208 -> a
-    18:22:int applicationSize():213:217 -> a
-    23:27:int applicationSize():213:217 -> a
+    18:23:int applicationSize():213:213 -> a
+    27:27:int applicationSize():217:217 -> a
     28:28:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):217:217 -> a
     29:33:java.util.List filter(java.util.List,com.android.tools.r8.ProgramResource$Kind):303:307 -> a
     34:37:void write(java.nio.file.Path,com.android.tools.r8.OutputMode):369:372 -> a
@@ -60605,33 +60592,33 @@
     136:136:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):807:807 -> a
     137:138:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.util.Collection):812:813 -> a
     137:138:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):807 -> a
-    139:140:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set):862:863 -> a
-    141:141:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set):862:862 -> a
+    139:141:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set):862:862 -> a
     142:142:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):875:875 -> a
     143:146:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):874:877 -> a
-    147:148:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(java.util.Collection):903:904 -> a
-    149:149:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):913:913 -> a
-    150:150:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin,java.util.Set):917:917 -> a
-    151:151:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):923:923 -> a
-    152:152:void addDataResources(com.android.tools.r8.DataResource[]):1066:1066 -> a
-    152:152:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):923 -> a
-    153:153:void addDataResources(java.util.Collection):1070:1070 -> a
-    153:153:void addDataResources(com.android.tools.r8.DataResource[]):1066 -> a
-    153:153:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):923 -> a
-    154:154:com.android.tools.r8.utils.AndroidApp$Builder setProguardMapOutputData(java.lang.String):934:934 -> a
-    155:155:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):961:961 -> a
-    156:156:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):968:968 -> a
-    156:156:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):961 -> a
-    157:157:com.android.tools.r8.utils.AndroidApp$Builder setIgnoreDexInArchive(boolean):984:984 -> a
-    158:197:com.android.tools.r8.utils.AndroidApp build():992:1031 -> a
-    198:198:void addProgramResources(com.android.tools.r8.ProgramResource[]):1058:1058 -> a
-    199:199:void addProgramResources(java.util.Collection):1062:1062 -> a
-    199:199:void addProgramResources(com.android.tools.r8.ProgramResource[]):1058 -> a
-    200:203:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1075:1078 -> a
-    204:219:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1076:1091 -> a
-    220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    220:220:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1091 -> a
-    221:221:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1091:1091 -> a
+    147:147:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[][]):901:901 -> a
+    148:149:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(java.util.Collection):906:907 -> a
+    150:150:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):916:916 -> a
+    151:151:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin,java.util.Set):920:920 -> a
+    152:152:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):926:926 -> a
+    153:153:void addDataResources(com.android.tools.r8.DataResource[]):1069:1069 -> a
+    153:153:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):926 -> a
+    154:154:void addDataResources(java.util.Collection):1073:1073 -> a
+    154:154:void addDataResources(com.android.tools.r8.DataResource[]):1069 -> a
+    154:154:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):926 -> a
+    155:155:com.android.tools.r8.utils.AndroidApp$Builder setProguardMapOutputData(java.lang.String):937:937 -> a
+    156:156:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):964:964 -> a
+    157:157:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):971:971 -> a
+    157:157:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):964 -> a
+    158:158:com.android.tools.r8.utils.AndroidApp$Builder setIgnoreDexInArchive(boolean):987:987 -> a
+    159:198:com.android.tools.r8.utils.AndroidApp build():995:1034 -> a
+    199:199:void addProgramResources(com.android.tools.r8.ProgramResource[]):1061:1061 -> a
+    200:200:void addProgramResources(java.util.Collection):1065:1065 -> a
+    200:200:void addProgramResources(com.android.tools.r8.ProgramResource[]):1061 -> a
+    201:204:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1078:1081 -> a
+    205:220:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1079:1094 -> a
+    221:221:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    221:221:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1094 -> a
+    222:222:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1094:1094 -> a
     1:4:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):630:633 -> b
     5:5:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):632:632 -> b
     6:6:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.nio.file.Path[]):743:743 -> b
@@ -60639,24 +60626,24 @@
     23:23:com.android.tools.r8.utils.AndroidApp$Builder addFilteredLibraryArchives(java.util.Collection):837:837 -> b
     24:27:com.android.tools.r8.utils.AndroidApp$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):851:854 -> b
     28:28:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):885:885 -> b
-    29:29:java.util.List getProgramResourceProviders():1096:1096 -> b
+    29:29:java.util.List getProgramResourceProviders():1099:1099 -> b
     1:1:com.android.tools.r8.utils.Reporter getReporter():626:626 -> c
     2:12:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):756:766 -> c
     13:13:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):762:762 -> c
     14:14:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFile(java.nio.file.Path):820:820 -> c
-    1:1:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):968:968 -> d
-    2:2:boolean hasMainDexList():973:973 -> d
-    3:11:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1038:1046 -> d
+    1:1:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):971:971 -> d
+    2:2:boolean hasMainDexList():976:976 -> d
+    3:11:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1041:1049 -> d
     12:13:boolean com.android.tools.r8.utils.FileUtils.isAarFile(java.nio.file.Path):73:74 -> d
-    12:13:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1047 -> d
+    12:13:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1050 -> d
     14:14:com.android.tools.r8.utils.AarArchiveResourceProvider com.android.tools.r8.utils.AarArchiveResourceProvider.fromArchive(java.nio.file.Path):38:38 -> d
-    14:14:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1048 -> d
-    15:19:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1048:1052 -> d
+    14:14:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1051 -> d
+    15:19:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1051:1055 -> d
     20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> d
-    20:20:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1052 -> d
-    21:21:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1052:1052 -> d
-    1:7:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):946:952 -> e
-    8:8:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):948:948 -> e
+    20:20:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1055 -> d
+    21:21:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1055:1055 -> d
+    1:7:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):949:955 -> e
+    8:8:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):951:951 -> e
     1:2:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.util.Collection):748:749 -> f
 com.android.tools.r8.utils.AndroidApp$Builder$1 -> com.android.tools.r8.utils.i:
     java.util.List val$dataResources -> b
@@ -60671,15 +60658,15 @@
 com.android.tools.r8.utils.AndroidApp$Builder$2 -> com.android.tools.r8.utils.e$b$a:
     java.util.List val$finalDataResources -> b
     java.util.List val$finalProgramResources -> a
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):997:997 -> <init>
-    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():1005:1006 -> getDataResourceProvider
-    1:1:java.util.Collection getProgramResources():1000:1000 -> getProgramResources
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):1000:1000 -> <init>
+    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():1008:1009 -> getDataResourceProvider
+    1:1:java.util.Collection getProgramResources():1003:1003 -> getProgramResources
 com.android.tools.r8.utils.AndroidApp$Builder$2$1 -> com.android.tools.r8.utils.j:
     com.android.tools.r8.utils.AndroidApp$Builder$2 this$1 -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():1006:1006 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$2):1006:1006 -> <init>
-    1:6:void accept(com.android.tools.r8.DataResourceProvider$Visitor):1009:1014 -> accept
+    1:1:void <clinit>():1009:1009 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$2):1009:1009 -> <init>
+    1:6:void accept(com.android.tools.r8.DataResourceProvider$Visitor):1012:1017 -> accept
 com.android.tools.r8.utils.AndroidAppConsumers -> com.android.tools.r8.utils.k:
     com.android.tools.r8.utils.AndroidApp$Builder builder -> a
     boolean $assertionsDisabled -> e
@@ -60808,8 +60795,7 @@
     57:60:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
     61:65:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
     61:65:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
-    66:67:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
-    68:68:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
+    66:68:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
     69:69:java.nio.file.Path getPath():190:190 -> a
     1:4:java.util.zip.ZipOutputStream getStreamRaw():80:83 -> b
     5:11:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
@@ -60848,8 +60834,8 @@
     108:109:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):143:144 -> a
     108:109:boolean isProgramResourceName(java.lang.String):138 -> a
     110:110:boolean isProgramResourceName(java.lang.String):138:138 -> a
-    1:15:void accept(com.android.tools.r8.DataResourceProvider$Visitor):114:128 -> accept
-    16:35:void accept(com.android.tools.r8.DataResourceProvider$Visitor):114:133 -> accept
+    1:16:void accept(com.android.tools.r8.DataResourceProvider$Visitor):114:114 -> accept
+    30:35:void accept(com.android.tools.r8.DataResourceProvider$Visitor):128:133 -> accept
     36:37:void accept(com.android.tools.r8.DataResourceProvider$Visitor):129:130 -> accept
     38:50:void accept(java.util.function.Consumer):142:154 -> accept
     51:60:void accept(java.util.function.Consumer):153:162 -> accept
@@ -61068,73 +61054,80 @@
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     1:17:void <clinit>():22:38 -> <clinit>
-    1:1:java.lang.String javaTypeToShorty(java.lang.String):150:150 -> A
+    1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):83:84 -> A
+    1:1:java.lang.String javaTypeToShorty(java.lang.String):150:150 -> B
     boolean isPrimitiveType(char) -> a
     1:12:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):44:55 -> a
     13:17:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):54:58 -> a
     18:23:java.lang.String toArrayDescriptor(int,java.lang.String):109:114 -> a
     24:30:java.lang.String descriptorToInternalName(java.lang.String):170:176 -> a
     31:31:java.lang.String descriptorToInternalName(java.lang.String):174:174 -> a
-    32:32:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):189:189 -> a
-    33:33:java.lang.String primitiveDescriptorToJavaType(char):254:254 -> a
-    33:33:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):201 -> a
-    34:34:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):199:199 -> a
-    35:39:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):192:196 -> a
-    40:46:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):411:417 -> a
-    47:47:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):416:416 -> a
-    48:48:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):414:414 -> a
-    49:56:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):422:429 -> a
-    57:60:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):428:431 -> a
-    61:65:java.lang.String guessTypeDescriptor(java.nio.file.Path):503:507 -> a
-    66:66:java.lang.String getPathFromJavaType(java.lang.Class):577:577 -> a
+    32:32:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):199:199 -> a
+    33:33:java.lang.String primitiveDescriptorToJavaType(char):264:264 -> a
+    33:33:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):211 -> a
+    34:34:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):209:209 -> a
+    35:39:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):202:206 -> a
+    40:58:java.lang.String getDescriptorFromKmType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):382:400 -> a
+    59:65:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):421:427 -> a
+    66:66:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):426:426 -> a
+    67:67:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):424:424 -> a
+    68:75:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):432:439 -> a
+    76:79:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):438:441 -> a
+    80:84:java.lang.String guessTypeDescriptor(java.nio.file.Path):513:517 -> a
+    85:85:java.lang.String getPathFromJavaType(java.lang.Class):587:587 -> a
     1:1:java.lang.String descriptorToJavaType(java.lang.String):160:160 -> b
-    1:3:int getArgumentCount(java.lang.String):650:652 -> c
-    1:36:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):604:639 -> d
-    37:42:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):625:630 -> d
-    43:67:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):612:636 -> d
-    68:68:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):621:621 -> d
-    1:2:java.lang.String getBinaryNameFromDescriptor(java.lang.String):337:338 -> e
-    1:1:java.lang.String getBinaryNameFromJavaType(java.lang.String):329:329 -> f
-    1:3:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):307:309 -> g
-    1:2:java.lang.String getClassFileName(java.lang.String):586:587 -> h
-    1:2:java.lang.String getClassNameFromDescriptor(java.lang.String):275:276 -> i
-    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):348:349 -> j
-    1:3:java.lang.String getDescriptorFromKotlinClassifier(java.lang.String):358:360 -> k
-    1:1:java.lang.String getPackageBinaryNameFromJavaType(java.lang.String):319:319 -> l
-    1:3:java.lang.String getPackageNameFromBinaryName(java.lang.String):481:483 -> m
-    1:1:java.lang.String getPackageNameFromDescriptor(java.lang.String):297:297 -> n
-    1:3:java.lang.String getPathFromDescriptor(java.lang.String):571:573 -> o
-    1:2:java.lang.String getPathFromJavaType(java.lang.String):581:582 -> p
-    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):591:592 -> q
-    1:1:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):265:265 -> r
-    2:3:java.lang.String getUnqualifiedClassNameFromBinaryName(java.lang.String):405:406 -> r
-    2:3:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):265 -> r
-    1:13:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):554:566 -> s
-    14:14:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):564:564 -> s
-    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> s
-    15:15:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):564 -> s
-    16:16:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):564:564 -> s
-    1:8:java.lang.String guessTypeDescriptor(java.lang.String):519:526 -> t
-    9:9:java.lang.String guessTypeDescriptor(java.lang.String):524:524 -> t
-    10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> t
-    10:10:java.lang.String guessTypeDescriptor(java.lang.String):524 -> t
-    11:11:java.lang.String guessTypeDescriptor(java.lang.String):524:524 -> t
-    1:26:boolean isClassDescriptor(java.lang.String):438:463 -> u
-    1:1:boolean isDescriptor(java.lang.String):228:228 -> v
-    2:5:boolean isPrimitiveDescriptor(java.lang.String):206:209 -> v
-    2:5:boolean isDescriptor(java.lang.String):229 -> v
-    6:10:boolean isArrayDescriptor(java.lang.String):218:222 -> v
-    6:10:boolean isDescriptor(java.lang.String):230 -> v
-    1:6:boolean isValidJavaType(java.lang.String):124:129 -> w
-    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):68:69 -> x
-    1:2:java.lang.String javaTypeToDescriptorIfValidJavaType(java.lang.String):94:95 -> y
-    1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):83:84 -> z
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.utils.P$a:
+    1:2:java.lang.String descriptorToKotlinClassifier(java.lang.String):186:187 -> c
+    1:3:int getArgumentCount(java.lang.String):660:662 -> d
+    1:36:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):614:649 -> e
+    37:42:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):635:640 -> e
+    43:67:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):622:646 -> e
+    68:68:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):631:631 -> e
+    1:2:java.lang.String getBinaryNameFromDescriptor(java.lang.String):347:348 -> f
+    1:1:java.lang.String getBinaryNameFromJavaType(java.lang.String):339:339 -> g
+    1:3:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):317:319 -> h
+    1:2:java.lang.String getClassFileName(java.lang.String):596:597 -> i
+    1:2:java.lang.String getClassNameFromDescriptor(java.lang.String):285:286 -> j
+    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):358:359 -> k
+    1:3:java.lang.String getDescriptorFromKotlinClassifier(java.lang.String):368:370 -> l
+    1:1:java.lang.String getPackageBinaryNameFromJavaType(java.lang.String):329:329 -> m
+    1:3:java.lang.String getPackageNameFromBinaryName(java.lang.String):491:493 -> n
+    1:1:java.lang.String getPackageNameFromDescriptor(java.lang.String):307:307 -> o
+    1:3:java.lang.String getPathFromDescriptor(java.lang.String):581:583 -> p
+    1:2:java.lang.String getPathFromJavaType(java.lang.String):591:592 -> q
+    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):601:602 -> r
+    1:1:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):275:275 -> s
+    2:3:java.lang.String getUnqualifiedClassNameFromBinaryName(java.lang.String):415:416 -> s
+    2:3:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):275 -> s
+    1:13:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):564:576 -> t
+    14:14:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):574:574 -> t
+    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> t
+    15:15:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):574 -> t
+    16:16:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):574:574 -> t
+    1:8:java.lang.String guessTypeDescriptor(java.lang.String):529:536 -> u
+    9:9:java.lang.String guessTypeDescriptor(java.lang.String):534:534 -> u
+    10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> u
+    10:10:java.lang.String guessTypeDescriptor(java.lang.String):534 -> u
+    11:11:java.lang.String guessTypeDescriptor(java.lang.String):534:534 -> u
+    1:26:boolean isClassDescriptor(java.lang.String):448:473 -> v
+    1:1:boolean isDescriptor(java.lang.String):238:238 -> w
+    2:5:boolean isPrimitiveDescriptor(java.lang.String):216:219 -> w
+    2:5:boolean isDescriptor(java.lang.String):239 -> w
+    6:10:boolean isArrayDescriptor(java.lang.String):228:232 -> w
+    6:10:boolean isDescriptor(java.lang.String):240 -> w
+    1:6:boolean isValidJavaType(java.lang.String):124:129 -> x
+    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):68:69 -> y
+    1:2:java.lang.String javaTypeToDescriptorIfValidJavaType(java.lang.String):94:95 -> z
+com.android.tools.r8.utils.DescriptorUtils$1 -> com.android.tools.r8.utils.P$a:
+    com.android.tools.r8.utils.Box val$descriptor -> b
+    1:1:void <init>(com.android.tools.r8.utils.Box):383:383 -> <init>
+    1:2:void visitClass(java.lang.String):388:389 -> a
+    1:2:void visitTypeAlias(java.lang.String):396:397 -> b
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.utils.P$b:
     java.lang.String module -> a
     java.lang.String descriptor -> b
-    1:3:void <init>(java.lang.String,java.lang.String):533:535 -> <init>
-    1:1:java.lang.String getDescriptor():543:543 -> a
-    1:1:java.lang.String getModule():539:539 -> b
+    1:3:void <init>(java.lang.String,java.lang.String):543:545 -> <init>
+    1:1:java.lang.String getDescriptor():553:553 -> a
+    1:1:java.lang.String getModule():549:549 -> b
 com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.utils.Q:
     byte[] dexVersionBytes -> b
     com.android.tools.r8.utils.DexVersion[] $VALUES -> g
@@ -61173,8 +61166,8 @@
     1:3:void <init>(java.nio.file.Path):24:26 -> <init>
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     1:5:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):39:43 -> a
-    6:8:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):49:51 -> a
-    9:15:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):49:55 -> a
+    6:9:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):49:49 -> a
+    11:15:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):51:55 -> a
     16:16:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):54:54 -> a
     17:17:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):52:52 -> a
     18:23:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):61:66 -> a
@@ -61319,8 +61312,8 @@
     1:9:java.util.List getClassFileDescriptors(java.lang.String,com.android.tools.r8.DiagnosticsHandler):116:124 -> a
     10:10:boolean lambda$getNonClassFiles$0(java.util.zip.ZipEntry):131:131 -> a
     11:31:com.android.tools.r8.utils.FeatureClassMapping fromJarFiles(java.util.List,java.util.List,java.lang.String,com.android.tools.r8.DiagnosticsHandler):144:164 -> a
-    1:6:java.util.List getNonClassFiles(java.lang.String,com.android.tools.r8.DiagnosticsHandler):129:134 -> b
-    7:14:java.util.List getNonClassFiles(java.lang.String,com.android.tools.r8.DiagnosticsHandler):129:136 -> b
+    1:7:java.util.List getNonClassFiles(java.lang.String,com.android.tools.r8.DiagnosticsHandler):129:129 -> b
+    12:14:java.util.List getNonClassFiles(java.lang.String,com.android.tools.r8.DiagnosticsHandler):134:136 -> b
 com.android.tools.r8.utils.FeatureClassMapping$JarFileOrigin -> com.android.tools.r8.utils.FeatureClassMapping$d:
     1:1:void <init>(java.nio.file.Path):84:84 -> <init>
     1:1:java.lang.String part():89:89 -> part
@@ -61428,399 +61421,403 @@
     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.f0:
-    java.util.function.BiPredicate dexClassChecksumFilter -> P
-    boolean enableUninstantiatedTypeOptimization -> f0
+    boolean enableValuePropagation -> f0
+    boolean enableKotlinMetadataRewriting -> P
     java.lang.String dumpInputToDirectory -> j
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> b0
-    java.util.Map missingEnclosingMembers -> Y0
+    boolean enableEnumValueOptimization -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
-    java.util.List logArgumentsFilter -> w0
-    boolean enableHorizontalClassMerging -> q
-    java.util.List methodsFilter -> s0
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> d1
-    boolean minimalMainDex -> V0
-    boolean applyInliningToInlinee -> y
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> R0
-    boolean enableDeterminismAnalysis -> G
-    int classInliningInstructionAllowance -> T
+    boolean enableFieldBitAccessAnalysis -> q
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> d1
+    boolean enableInlining -> y
+    com.android.tools.r8.StringConsumer configurationConsumer -> h1
+    boolean debug -> R0
+    boolean enableInitializedClassesAnalysis -> G
+    int callGraphLikelySpuriousCallEdgeThreshold -> T
+    boolean forceProguardCompatibility -> N0
     boolean printMemory -> h
-    boolean printCfg -> J0
-    boolean processCovariantReturnTypeAnnotations -> E0
-    java.util.Map warningInvalidDebugInfo -> a1
+    boolean enableTreeShaking -> J0
+    java.util.Map warningInvalidParameterAnnotations -> a1
     java.lang.String dumpInputToFile -> i
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> C0
-    boolean enableNameReflectionOptimization -> I
-    boolean enableNestBasedAccessDesugaring -> A0
-    boolean skipReadingDexCode -> b1
-    boolean enableCfInterfaceMethodDesugaring -> Q
-    boolean enableVerticalClassMerging -> r
-    java.util.Set extensiveLoggingFilter -> q0
-    int minApiLevel -> t0
-    boolean readCompileTimeAnnotations -> v0
-    boolean enableStringSwitchConversion -> Y
-    boolean enableServiceLoaderRewriting -> H
-    int inliningInstructionLimit -> U
-    boolean ignoreMainDexMissingClasses -> n0
-    boolean useSmaliSyntax -> j0
-    boolean enableKotlinMetadataRewriting -> N
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> j1
+    boolean enableDeterminismAnalysis -> I
+    boolean enableLambdaMerging -> A0
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> O0
+    boolean encodeChecksums -> Q
+    boolean enableHorizontalClassMerging -> r
+    boolean enableLoadStoreOptimization -> z0
+    boolean enableEnumUnboxing -> z
+    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> B0
+    boolean enableSideEffectAnalysis -> H
+    int classInliningInstructionLimit -> U
+    boolean quiet -> n0
+    boolean enableRedundantConstNumberOptimization -> j0
+    boolean enablePropagationOfDynamicTypesAtCallSites -> N
     boolean enableDynamicTypeOptimization -> o
-    boolean enableUninstantiatedTypeOptimizationForInterfaces -> g0
-    com.android.tools.r8.dex.Marker marker -> p0
-    boolean enableRedundantFieldLoadElimination -> c0
-    boolean enableNonNullTracking -> w
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> S0
-    boolean enableInheritanceClassInDexDistributor -> W0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> e1
-    boolean enableInitializedClassesAnalysis -> E
-    int inliningInstructionAllowance -> V
-    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> N0
-    boolean $assertionsDisabled -> p1
-    boolean configurationDebugging -> O0
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> i1
+    boolean enableValuePropagationForInstanceFields -> g0
+    boolean enableDevirtualization -> w
+    int SUPPORTED_DEX_VERSION -> p1
+    boolean minimalMainDex -> W0
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> S0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> e1
+    boolean enableClassInlining -> E
+    int classInliningInstructionAllowance -> V
     com.android.tools.r8.ProgramConsumer programConsumer -> d
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> i1
     java.util.Set neverMergePrefixes -> m
-    boolean encodeChecksums -> O
-    boolean lookupLibraryBeforeProgram -> F0
-    boolean enableFieldBitAccessAnalysis -> p
-    boolean enableNestReduction -> B0
-    boolean enableInlining -> x
+    boolean enableMinification -> K0
+    boolean enablePropagationOfConstantsAtCallSites -> O
+    boolean enableFieldAssignmentTracker -> p
+    boolean skipReadingDexCode -> c1
+    int numberOfThreads -> k0
+    boolean enableNonNullTracking -> x
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> t0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> a0
-    boolean enableSideEffectAnalysis -> F
-    int inliningMonitorEnterValuesAllowance -> W
+    boolean intermediate -> w0
+    boolean enableClassStaticizer -> F
+    int inliningInstructionLimit -> W
     boolean printTimes -> g
-    boolean hasMarker -> o0
-    boolean verbose -> k0
+    boolean invalidDebugInfoFatal -> o0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> F0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
-    boolean enableValuePropagation -> d0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> k1
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> T0
-    boolean enablePropagationOfDynamicTypesAtCallSites -> L
-    boolean enableUnusedInterfaceRemoval -> u
-    int SUPPORTED_DEX_VERSION -> o1
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> d0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> k1
+    boolean enableStringConcatenationOptimization -> L
+    boolean enableUnusedArgumentRemoval -> u
+    java.util.List logArgumentsFilter -> y0
+    boolean enableInheritanceClassInDexDistributor -> X0
+    java.util.List methodsFilter -> u0
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean skipIR -> P0
-    int inliningControlFlowResolutionBlocksThreshold -> X
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> f1
-    boolean ignoreMissingClasses -> L0
-    boolean enableTreeShaking -> H0
-    boolean enableClassInlining -> C
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> h1
-    boolean enablePropagationOfConstantsAtCallSites -> M
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> T0
+    boolean configurationDebugging -> P0
+    java.util.function.Consumer syntheticProguardRulesConsumer -> n1
+    boolean $assertionsDisabled -> q1
+    int inliningInstructionAllowance -> X
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> f1
+    boolean printCfg -> L0
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> j1
+    boolean lookupLibraryBeforeProgram -> H0
+    boolean enableInliningOfInvokesWithNullableReceivers -> C
+    boolean enableTreeShakingOfLibraryMethodOverrides -> M
     boolean libraryInterfacesMayHaveStaticInitialization -> n
-    boolean enableMainDexListCheck -> G0
-    boolean enableDevirtualization -> v
-    boolean enableLoadStoreOptimization -> x0
-    java.util.List mainDexKeepRules -> U0
-    int applyInliningToInlineeMaxDepth -> z
-    boolean quiet -> l0
-    boolean enableRedundantConstNumberOptimization -> h0
-    boolean enableClassStaticizer -> D
-    boolean enableValuePropagationForInstanceFields -> e0
-    boolean enableStringConcatenationOptimization -> J
+    boolean processCovariantReturnTypeAnnotations -> G0
+    boolean enableNestBasedAccessDesugaring -> C0
+    java.util.Set extensiveLoggingFilter -> s0
+    boolean enableUnusedInterfaceRemoval -> v
+    boolean readCompileTimeAnnotations -> x0
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> Y0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> m1
+    boolean ignoreMainDexMissingClasses -> p0
+    int minApiLevel -> v0
+    int inliningMonitorEnterValuesAllowance -> Y
+    boolean useSmaliSyntax -> l0
+    boolean enableUninstantiatedTypeOptimization -> h0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> E0
+    boolean disableInliningOfLibraryMethodOverrides -> D
+    com.android.tools.r8.dex.Marker marker -> r0
+    boolean enableRedundantFieldLoadElimination -> e0
+    java.util.function.BiPredicate dexClassChecksumFilter -> R
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> U0
+    boolean enableServiceLoaderRewriting -> J
+    boolean enableStringSwitchConversion -> a0
     boolean passthroughDexCode -> k
-    java.util.Map warningInvalidParameterAnnotations -> Z0
-    boolean enableArgumentRemoval -> s
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> c1
-    boolean enableEnumValueOptimization -> Z
-    boolean debug -> Q0
-    com.android.tools.r8.StringConsumer configurationConsumer -> g1
-    java.util.function.Consumer syntheticProguardRulesConsumer -> m1
-    boolean forceProguardCompatibility -> M0
-    boolean enableInliningOfInvokesWithNullableReceivers -> A
-    int callGraphLikelySpuriousCallEdgeThreshold -> R
-    boolean enableMinification -> I0
+    java.util.Map missingEnclosingMembers -> Z0
+    java.util.Set reportedMissingForDesugaring -> o1
+    boolean enableVerticalClassMerging -> s
+    int inliningControlFlowResolutionBlocksThreshold -> Z
+    boolean skipIR -> Q0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> g1
+    boolean ignoreMissingClasses -> M0
+    boolean applyInliningToInlinee -> A
+    boolean enableMainDexListCheck -> I0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> l1
+    boolean enableNestReduction -> D0
+    java.util.Map warningInvalidDebugInfo -> b1
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> D0
-    boolean enableTreeShakingOfLibraryMethodOverrides -> K
+    boolean enableNameReflectionOptimization -> K
     boolean enableNeverMergePrefixes -> l
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> r0
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> X0
-    int numberOfThreads -> i0
-    boolean enableLambdaMerging -> y0
-    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> z0
-    boolean enableUnusedArgumentRemoval -> t
-    boolean intermediate -> u0
-    java.util.Set reportedMissingForDesugaring -> n1
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> l1
-    boolean invalidDebugInfoFatal -> m0
-    boolean disableInliningOfLibraryMethodOverrides -> B
-    int classInliningInstructionLimit -> S
-    java.lang.String printCfgFile -> K0
-    1:21:void <clinit>():66:86 -> <clinit>
-    1:1:void <init>():110:110 -> <init>
-    2:549:void <init>():104:651 -> <init>
-    550:554:void <init>():111:115 -> <init>
-    555:555:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):119:119 -> <init>
-    556:1103:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):104:651 -> <init>
-    1104:1111:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):120:127 -> <init>
-    1112:1112:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):131:131 -> <init>
-    1113:1660:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):104:651 -> <init>
-    1661:1672:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):132:143 -> <init>
-    1:9:java.util.Set getExtensiveLoggingFilter():487:495 -> A
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():312:312 -> B
-    2:2:boolean hasConsumer():308:308 -> B
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():312 -> B
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():312:312 -> B
-    4:4:boolean isGeneratingDexIndexed():337:337 -> B
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():313 -> B
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():314:314 -> B
-    6:6:boolean isGeneratingDexFilePerClassFile():341:341 -> B
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():315 -> B
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():316:316 -> B
-    8:8:boolean isGeneratingClassFiles():345:345 -> B
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():317 -> B
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():318:320 -> B
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():97:97 -> C
-    1:1:boolean hasMethodsFilter():901:901 -> D
-    1:1:boolean hasProguardConfiguration():93:93 -> E
-    1:1:boolean hasUsageInformationConsumer():608:608 -> F
-    1:1:boolean isDesugaredLibraryCompilation():324:324 -> G
-    1:1:boolean isGeneratingClassFiles():345:345 -> H
-    1:1:boolean isGeneratingDexIndexed():337:337 -> I
-    1:1:boolean isGeneratingDex():333 -> I
-    2:2:boolean isGeneratingDexFilePerClassFile():341:341 -> I
-    2:2:boolean isGeneratingDex():333 -> I
-    1:1:boolean hasConsumer():308:308 -> J
-    1:1:boolean isInterfaceMethodDesugaringEnabled():1133 -> J
-    2:4:boolean isInterfaceMethodDesugaringEnabled():1136:1138 -> J
-    1:1:boolean isMinifying():440:440 -> K
-    1:1:boolean isShrinking():436:436 -> L
-    1:1:boolean isStringSwitchConversionEnabled():1142:1142 -> M
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():479:479 -> N
-    1:32:boolean printWarnings():826:857 -> O
-    33:72:boolean printWarnings():853:892 -> O
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():475:475 -> P
-    1:4:boolean shouldDesugarNests():383:386 -> Q
-    5:5:boolean isGeneratingClassFiles():345:345 -> Q
-    5:5:boolean canUseNestBasedAccess():1116 -> Q
-    5:5:boolean shouldDesugarNests():386 -> Q
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():483:483 -> R
-    1:18:void signalFinishedToConsumers():361:378 -> S
+    java.util.List mainDexKeepRules -> V0
+    int applyInliningToInlineeMaxDepth -> B
+    boolean enableCfInterfaceMethodDesugaring -> S
+    boolean enableArgumentRemoval -> t
+    boolean hasMarker -> q0
+    boolean verbose -> m0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> c0
+    boolean enableUninstantiatedTypeOptimizationForInterfaces -> i0
+    1:21:void <clinit>():68:88 -> <clinit>
+    1:1:void <init>():112:112 -> <init>
+    2:551:void <init>():106:655 -> <init>
+    552:556:void <init>():113:117 -> <init>
+    557:557:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    558:1107:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:655 -> <init>
+    1108:1115:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1116:1116:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1117:1666:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:655 -> <init>
+    1667:1678:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
+    1:9:java.util.Set getExtensiveLoggingFilter():491:499 -> A
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():316:316 -> B
+    2:2:boolean hasConsumer():312:312 -> B
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():316 -> B
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():316:316 -> B
+    4:4:boolean isGeneratingDexIndexed():341:341 -> B
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():317 -> B
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():318:318 -> B
+    6:6:boolean isGeneratingDexFilePerClassFile():345:345 -> B
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():319 -> B
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():320:320 -> B
+    8:8:boolean isGeneratingClassFiles():349:349 -> B
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():321 -> B
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():322:324 -> B
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> C
+    1:1:boolean hasMethodsFilter():905:905 -> D
+    1:1:boolean hasProguardConfiguration():95:95 -> E
+    1:1:boolean hasUsageInformationConsumer():612:612 -> F
+    1:1:boolean isCallSiteOptimizationEnabled():1138:1138 -> G
+    1:1:boolean isDesugaredLibraryCompilation():328:328 -> H
+    1:1:boolean isGeneratingClassFiles():349:349 -> I
+    1:1:boolean isGeneratingDexIndexed():341:341 -> J
+    1:1:boolean isGeneratingDex():337 -> J
+    2:2:boolean isGeneratingDexFilePerClassFile():345:345 -> J
+    2:2:boolean isGeneratingDex():337 -> J
+    1:1:boolean hasConsumer():312:312 -> K
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1148 -> K
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1151:1153 -> K
+    1:1:boolean isMinifying():444:444 -> L
+    1:1:boolean isShrinking():440:440 -> M
+    1:1:boolean isStringSwitchConversionEnabled():1157:1157 -> N
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():483:483 -> O
+    1:32:boolean printWarnings():830:861 -> P
+    33:72:boolean printWarnings():857:896 -> P
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():479:479 -> Q
+    1:4:boolean shouldDesugarNests():387:390 -> R
+    5:5:boolean isGeneratingClassFiles():349:349 -> R
+    5:5:boolean canUseNestBasedAccess():1122 -> R
+    5:5:boolean shouldDesugarNests():390 -> R
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():487:487 -> S
+    1:18:void signalFinishedToConsumers():365:382 -> T
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:2:void setMarker(com.android.tools.r8.dex.Marker):277:278 -> a
-    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):282:283 -> a
-    5:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):290:297 -> a
-    5:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
-    13:13:boolean isGeneratingClassFiles():345:345 -> a
-    13:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):298 -> a
-    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
-    14:17:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):299:302 -> a
-    14:17:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
-    18:18:boolean assertionsEnabled():646:646 -> a
-    19:19:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):654:654 -> a
-    20:20:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> a
-    21:27:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):770:776 -> a
-    28:28: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):771:771 -> a
-    29:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):783:784 -> a
-    31:31:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):786 -> a
-    32:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):786:788 -> a
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):789 -> a
-    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):789:789 -> a
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):792 -> a
-    38:38:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):792:792 -> a
-    39:39:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):784:784 -> a
-    40:43:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):797:800 -> a
-    44:48:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):805:809 -> a
-    49:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):814:820 -> a
-    56:56:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):815:815 -> a
-    57:57:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):819:819 -> a
-    58:63:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):906:911 -> a
-    64:65:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1087:1088 -> a
-    1:3:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):710:712 -> b
-    4:9:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):726:731 -> b
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):281:282 -> a
+    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):286:287 -> a
+    5:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):294:301 -> a
+    5:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):289 -> a
+    13:13:boolean isGeneratingClassFiles():349:349 -> a
+    13:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):302 -> a
+    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):289 -> a
+    14:17:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):303:306 -> a
+    14:17:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):289 -> a
+    18:18:boolean assertionsEnabled():650:650 -> a
+    19:19:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):658:658 -> a
+    20:20:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> a
+    21:27:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):774:780 -> a
+    28:28: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):775:775 -> a
+    29:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):787:788 -> a
+    31:31:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> a
+    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):790 -> a
+    32:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):790:792 -> a
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):793 -> a
+    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):793:793 -> a
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
+    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):796 -> a
+    38:38:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):796:796 -> a
+    39:39:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):788:788 -> a
+    40:43:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):801:804 -> a
+    44:48:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):809:813 -> a
+    49:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):818:824 -> a
+    56:56:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):819:819 -> a
+    57:57:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):823:823 -> a
+    58:63:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):910:915 -> a
+    64:65:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1093:1094 -> a
+    1:3:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):714:716 -> b
+    4:9:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):730:735 -> b
     10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> b
-    10:10:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):731 -> b
-    11:38:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):733:760 -> b
-    39:39:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):808:808 -> b
-    40:40:boolean canHaveArtCheckCastVerifierBug():1463:1463 -> b
-    1:1:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):692:692 -> c
+    10:10:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):735 -> b
+    11:38:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):737:764 -> b
+    39:39:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):812:812 -> b
+    40:40:boolean canHaveArtCheckCastVerifierBug():1478:1478 -> b
+    1:1:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):696:696 -> c
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> c
-    2:2:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):693 -> c
-    3:5:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):694:696 -> c
-    6:6:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> c
-    6:6:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):697 -> c
-    7:8:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701:702 -> c
-    9:9:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> c
-    9:9:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):704 -> c
-    10:10:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):704:704 -> c
-    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):764:764 -> c
-    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):706 -> c
-    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):706:706 -> c
-    13:13:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):702:702 -> c
-    14:16:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):719:721 -> c
-    17:17:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):799:799 -> c
-    18:19:boolean canHaveArtInstanceOfVerifierBug():1418:1419 -> c
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):665:668 -> d
-    5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> d
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):670 -> d
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):670:672 -> d
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):668:668 -> d
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):654:654 -> d
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):666 -> d
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> d
+    2:2:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):697 -> c
+    3:5:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):698:700 -> c
+    6:6:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> c
+    6:6:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701 -> c
+    7:8:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):705:706 -> c
+    9:9:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> c
+    9:9:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):708 -> c
+    10:10:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):708:708 -> c
+    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):768:768 -> c
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):710 -> c
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):710:710 -> c
+    13:13:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):706:706 -> c
+    14:16:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):723:725 -> c
+    17:17:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):803:803 -> c
+    18:19:boolean canHaveArtInstanceOfVerifierBug():1433:1434 -> c
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):669:672 -> d
+    5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> d
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):674 -> d
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):674:676 -> d
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):672:672 -> d
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):658:658 -> d
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):670 -> d
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684:684 -> d
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):190:190 -> d
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681 -> d
-    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):682:682 -> d
-    14:14:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> d
-    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):683 -> d
-    15:15:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):687:687 -> d
-    16:16:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):764:764 -> d
-    16:16:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):687 -> d
-    17:17:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):687:687 -> d
-    18:18:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1495:1495 -> d
-    1:1:boolean isGeneratingClassFiles():345:345 -> e
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1509 -> e
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1509:1509 -> e
-    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):658:661 -> e
-    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):654:654 -> e
-    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):659 -> e
-    1:1:boolean isGeneratingClassFiles():345:345 -> f
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1165 -> f
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1165:1165 -> f
-    1:1:boolean isGeneratingClassFiles():345:345 -> g
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1120 -> g
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1120:1120 -> g
-    1:1:boolean isGeneratingClassFiles():345:345 -> h
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1155 -> h
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1155:1155 -> h
-    1:1:boolean isGeneratingClassFiles():345:345 -> i
-    1:1:boolean canUseConstantMethodHandle():1100 -> i
-    2:2:boolean canUseConstantMethodHandle():1100:1100 -> i
-    1:1:boolean isGeneratingClassFiles():345:345 -> j
-    1:1:boolean canUseConstantMethodType():1104 -> j
-    2:2:boolean canUseConstantMethodType():1104:1104 -> j
-    1:1:boolean isGeneratingClassFiles():345:345 -> k
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1112 -> k
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1112:1112 -> k
-    1:2:boolean canUseFilledNewArrayOfObjects():1177:1178 -> l
-    1:1:boolean isGeneratingClassFiles():345:345 -> m
-    1:1:boolean canUseInvokeCustom():1108 -> m
-    2:2:boolean canUseInvokeCustom():1108:1108 -> m
-    1:1:boolean isGeneratingClassFiles():345:345 -> n
-    1:1:boolean canUseInvokePolymorphic():1096 -> n
-    2:2:boolean canUseInvokePolymorphic():1096:1096 -> n
-    1:1:boolean isGeneratingClassFiles():345:345 -> o
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1092 -> o
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1092:1092 -> o
-    1:2:boolean canUseMultidex():1146:1147 -> p
-    1:1:boolean isGeneratingClassFiles():345:345 -> q
-    1:1:boolean canUseNotInstruction():1213 -> q
-    2:2:boolean canUseNotInstruction():1213:1213 -> q
-    1:1:boolean isGeneratingClassFiles():345:345 -> r
-    1:1:boolean canUsePrivateInterfaceMethods():1128 -> r
-    2:2:boolean canUsePrivateInterfaceMethods():1128:1128 -> r
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1186:1187 -> s
-    1:1:boolean isGeneratingClassFiles():345:345 -> t
-    1:1:boolean canUseSuppressedExceptions():1151 -> t
-    2:2:boolean canUseSuppressedExceptions():1151:1151 -> t
-    1:1:boolean isGeneratingClassFiles():345:345 -> u
-    1:1:boolean canUseTwrCloseResourceMethod():1124 -> u
-    2:2:boolean canUseTwrCloseResourceMethod():1124:1124 -> u
-    1:4:void disableAllOptimizations():147:150 -> v
-    1:18:void disableGlobalOptimizations():154:171 -> w
-    1:1:void disableNameReflectionOptimization():1076:1076 -> x
-    1:2:void enablePropagationOfConstantsAtCallSites():1082:1083 -> y
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():513:521 -> z
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):685 -> d
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):686:686 -> d
+    14:14:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> d
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):687 -> d
+    15:15:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):691:691 -> d
+    16:16:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):768:768 -> d
+    16:16:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):691 -> d
+    17:17:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):691:691 -> d
+    18:18:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1510:1510 -> d
+    1:1:boolean isGeneratingClassFiles():349:349 -> e
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1524 -> e
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1524:1524 -> e
+    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):662:665 -> e
+    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):658:658 -> e
+    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):663 -> e
+    1:1:boolean isGeneratingClassFiles():349:349 -> f
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1180 -> f
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1180:1180 -> f
+    1:1:boolean isGeneratingClassFiles():349:349 -> g
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1126 -> g
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1126:1126 -> g
+    1:1:boolean isGeneratingClassFiles():349:349 -> h
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1170 -> h
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1170:1170 -> h
+    1:1:boolean isGeneratingClassFiles():349:349 -> i
+    1:1:boolean canUseConstantMethodHandle():1106 -> i
+    2:2:boolean canUseConstantMethodHandle():1106:1106 -> i
+    1:1:boolean isGeneratingClassFiles():349:349 -> j
+    1:1:boolean canUseConstantMethodType():1110 -> j
+    2:2:boolean canUseConstantMethodType():1110:1110 -> j
+    1:1:boolean isGeneratingClassFiles():349:349 -> k
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1118 -> k
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1118:1118 -> k
+    1:2:boolean canUseFilledNewArrayOfObjects():1192:1193 -> l
+    1:1:boolean isGeneratingClassFiles():349:349 -> m
+    1:1:boolean canUseInvokeCustom():1114 -> m
+    2:2:boolean canUseInvokeCustom():1114:1114 -> m
+    1:1:boolean isGeneratingClassFiles():349:349 -> n
+    1:1:boolean canUseInvokePolymorphic():1102 -> n
+    2:2:boolean canUseInvokePolymorphic():1102:1102 -> n
+    1:1:boolean isGeneratingClassFiles():349:349 -> o
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1098 -> o
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1098:1098 -> o
+    1:2:boolean canUseMultidex():1161:1162 -> p
+    1:1:boolean isGeneratingClassFiles():349:349 -> q
+    1:1:boolean canUseNotInstruction():1228 -> q
+    2:2:boolean canUseNotInstruction():1228:1228 -> q
+    1:1:boolean isGeneratingClassFiles():349:349 -> r
+    1:1:boolean canUsePrivateInterfaceMethods():1134 -> r
+    2:2:boolean canUsePrivateInterfaceMethods():1134:1134 -> r
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1201:1202 -> s
+    1:1:boolean isGeneratingClassFiles():349:349 -> t
+    1:1:boolean canUseSuppressedExceptions():1166 -> t
+    2:2:boolean canUseSuppressedExceptions():1166:1166 -> t
+    1:1:boolean isGeneratingClassFiles():349:349 -> u
+    1:1:boolean canUseTwrCloseResourceMethod():1130 -> u
+    2:2:boolean canUseTwrCloseResourceMethod():1130:1130 -> u
+    1:4:void disableAllOptimizations():149:152 -> v
+    1:18:void disableGlobalOptimizations():156:173 -> w
+    1:1:void disableNameReflectionOptimization():1082:1082 -> x
+    1:2:void enablePropagationOfConstantsAtCallSites():1088:1089 -> y
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():517:525 -> z
 com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.utils.f0$a:
     com.android.tools.r8.utils.InternalOptions$DesugarState ONLY_BACKPORT_STATICS -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> c
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> a
-    1:4:void <clinit>():78:81 -> <clinit>
-    1:1:void <init>(java.lang.String,int):77:77 -> <init>
+    1:4:void <clinit>():80:83 -> <clinit>
+    1:1:void <init>(java.lang.String,int):79:79 -> <init>
 com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.f0$b:
     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):565:568 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):569:572 -> <init>
 com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.utils.f0$c:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():944:946 -> <init>
+    1:3:void <init>():948:950 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.f0$d:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
-    1:2:void <clinit>():73:74 -> <clinit>
-    1:1:void <init>(java.lang.String,int):72:72 -> <init>
+    1:2:void <clinit>():75:76 -> <clinit>
+    1:1:void <init>(java.lang.String,int):74:74 -> <init>
 com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.f0$e:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():933:941 -> <init>
+    1:9:void <init>():937:945 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.f0$f:
     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>():926:930 -> <clinit>
-    6:6:void <clinit>():924:924 -> <clinit>
-    1:1:void <init>(java.lang.String,int):924:924 -> <init>
+    1:5:void <clinit>():930:934 -> <clinit>
+    6:6:void <clinit>():928:928 -> <clinit>
+    1:1:void <init>(java.lang.String,int):928:928 -> <init>
 com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.utils.f0$g:
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:13:void <init>():949:961 -> <init>
-    1:1:boolean isProtoShrinkingEnabled():964:964 -> a
+    1:13:void <init>():953:965 -> <init>
+    1:1:boolean isProtoShrinkingEnabled():968:968 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.f0$h:
     boolean enableSwitchToIfRewriting -> m
-    boolean forceAssumeNoneInsertion -> o
-    java.util.function.Consumer callSiteOptimizationInfoInspector -> N
+    boolean forceRedundantConstNumberRemoval -> o
     boolean reportUnusedProguardConfigurationRules -> i
-    boolean allowOutlinerInterfaceArrayArguments -> J
+    boolean readInputStackMaps -> J
     boolean enableCheckCastAndInstanceOfRemoval -> k
-    java.util.Set validInliningReasons -> u
-    boolean measureProguardIfRuleEvaluations -> L
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> K
-    boolean forceNameReflectionOptimization -> w
-    boolean placeExceptionalBlocksLast -> q
+    boolean nondeterministicCycleElimination -> u
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> N
+    boolean noLocalsTableOnInput -> w
+    boolean invertConditionals -> q
     com.android.tools.r8.utils.IROrdering irOrdering -> b
-    boolean forceJumboStringProcessing -> s
-    java.util.function.Consumer irModifier -> y
-    boolean allowNonAbstractClassesWithAbstractMethods -> E
-    boolean disableL8AnnotationRemoval -> f
-    boolean verifyKeptGraphInfo -> G
-    boolean allowUnusedProguardConfigurationRules -> h
-    boolean dontReportFailingCheckDiscarded -> A
-    boolean allowTypeErrors -> d
-    java.io.PrintStream whyAreYouNotInliningConsumer -> C
-    boolean forceRedundantConstNumberRemoval -> n
-    boolean invertConditionals -> p
-    boolean readInputStackMaps -> I
+    boolean dontCreateMarkerInD8 -> s
+    int basicBlockMuncherIterationLimit -> A
+    boolean enableNarrowingChecksInD8 -> y
+    boolean trackDesugaredAPIConversions -> E
+    boolean allowInvokeErrors -> f
+    boolean enableForceNestBasedAccessDesugaringForTest -> G
+    boolean allowClassInlinerGracefulExit -> h
+    boolean deterministicSortingBasedOnDexType -> C
+    boolean addCallEdgesForLibraryInvokes -> d
+    boolean measureProguardIfRuleEvaluations -> M
+    boolean enableEnumUnboxingDebugLogs -> n
+    java.util.function.Consumer callSiteOptimizationInfoInspector -> O
+    boolean forceAssumeNoneInsertion -> p
+    boolean dumpAll -> I
     boolean alwaysUsePessimisticRegisterAllocation -> j
+    boolean allowOutlinerInterfaceArrayArguments -> K
     boolean enableDeadSwitchCaseElimination -> l
-    boolean noLocalsTableOnInput -> v
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> M
-    boolean enableNarrowingChecksInD8 -> x
-    boolean dontCreateMarkerInD8 -> r
-    boolean nondeterministicCycleElimination -> t
+    java.util.Set validInliningReasons -> v
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> L
+    boolean forceNameReflectionOptimization -> x
+    boolean placeExceptionalBlocksLast -> r
+    java.util.function.Consumer irModifier -> z
+    boolean forceJumboStringProcessing -> t
     byte[] forceDexVersionBytes -> a
-    int basicBlockMuncherIterationLimit -> z
-    boolean allowInvokeErrors -> e
-    boolean enableForceNestBasedAccessDesugaringForTest -> F
-    boolean allowClassInlinerGracefulExit -> g
-    boolean dumpAll -> H
-    boolean deterministicSortingBasedOnDexType -> B
-    boolean addCallEdgesForLibraryInvokes -> c
-    boolean trackDesugaredAPIConversions -> D
-    1:100:void <init>():970:1069 -> <init>
+    java.util.function.Consumer waveModifier -> c
+    boolean allowTypeErrors -> e
+    boolean allowNonAbstractClassesWithAbstractMethods -> F
+    boolean disableL8AnnotationRemoval -> g
+    boolean verifyKeptGraphInfo -> H
+    java.io.PrintStream whyAreYouNotInliningConsumer -> D
+    boolean dontReportFailingCheckDiscarded -> B
+    1:102:void <init>():974:1075 -> <init>
+    void lambda$new$0(java.util.Deque) -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.f0$h$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1046:1048 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1052:1053 -> 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):1053:1053 -> a
+    1:3:void <init>():1052:1054 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1058:1059 -> 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):1059:1059 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.f0$h$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1063:1066 -> <init>
+    1:4:void <init>():1069:1072 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.f0$i:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):577:579 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):581:583 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.g0:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -61829,7 +61826,9 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.i0:
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.utils.h0:
+    1:2:int firstIndexMatching(java.lang.Iterable,java.util.function.Predicate):13:14 -> a
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.j0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):21:21 -> a
@@ -61837,7 +61836,7 @@
     6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):104:116 -> a
     1:3:java.lang.Object peekPrevious(java.util.ListIterator):54:56 -> b
     4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):81:84 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.h0:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.i0:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
@@ -61846,7 +61845,7 @@
     1:1:boolean hasNext():38:38 -> hasNext
     1:5:java.lang.Object next():43:47 -> next
     6:6:java.lang.Object next():45:45 -> next
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.k0:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.l0:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -61854,11 +61853,11 @@
     2:2:java.util.Map lambda$put$0(java.lang.Object):46:46 -> a
     3:4:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.j0:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.k0:
     int columnCapacity -> a
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.l0:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.m0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -61869,7 +61868,7 @@
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsSleb128(int):110:110 -> c
     1:1:int sizeAsUleb128(int):57:57 -> d
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.m0:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.n0:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):15:15 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):13:13 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13:13 -> a
@@ -61879,56 +61878,56 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> c
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.u0:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.v0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():59:59 -> <clinit>
     1:1:com.android.tools.r8.ir.code.Position access$900(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):59:59 -> a
     2:12:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):268:278 -> a
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
     13:13:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):279 -> a
     14:16:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):279:281 -> a
-    17:19:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):457:459 -> a
+    17:19:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):469:471 -> a
     17:19:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):289 -> a
     20:58:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):292:330 -> a
-    59:161:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):544:646 -> a
+    59:161:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):556:658 -> a
     59:161:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):331 -> a
     162:162:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):333:333 -> a
-    163:187:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):655:679 -> a
+    163:187:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):667:691 -> a
     163:187:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):334 -> a
-    188:188:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):672:672 -> a
+    188:188:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):684:684 -> a
     188:188:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):334 -> a
     189:220:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):338:369 -> a
     221:221:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
     221:221:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):369 -> a
-    222:250:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):370:398 -> a
-    251:261:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):396:406 -> a
-    262:274:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):403:415 -> a
-    275:276:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):284:285 -> a
-    277:277:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):283:283 -> a
-    278:279:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):361:362 -> a
-    280:280:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):365:365 -> a
-    281:281:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    281:281:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):366 -> a
-    282:282:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):365:365 -> a
-    283:296:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):419:432 -> a
-    297:297:void sortMethods(java.util.List):441:441 -> a
-    298:299:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):443:444 -> a
-    300:300:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1205:1205 -> a
-    300:300:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):447 -> a
-    301:301:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):468:468 -> a
-    302:308:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):470:476 -> a
-    309:309:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
-    309:309:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):476 -> a
-    310:310:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):477:477 -> a
-    311:318:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):484:491 -> a
-    319:326:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):502:509 -> a
-    319:326:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):492 -> a
-    327:329:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):493:495 -> a
-    330:330:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):494:494 -> a
-    331:336:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):515:520 -> a
-    337:339:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):528:530 -> a
-    1:4:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):685:688 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.n0:
+    222:262:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):370:410 -> a
+    263:273:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):408:418 -> a
+    274:286:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):415:427 -> a
+    287:288:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):284:285 -> a
+    289:289:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):283:283 -> a
+    290:291:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):361:362 -> a
+    292:292:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):365:365 -> a
+    293:293:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():725:725 -> a
+    293:293:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):366 -> a
+    294:294:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):365:365 -> a
+    295:308:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):431:444 -> a
+    309:309:void sortMethods(java.util.List):453:453 -> a
+    310:311:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):455:456 -> a
+    312:312:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1205:1205 -> a
+    312:312:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):459 -> a
+    313:313:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):480:480 -> a
+    314:320:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):482:488 -> a
+    321:321:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
+    321:321:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):488 -> a
+    322:322:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):489:489 -> a
+    323:330:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):496:503 -> a
+    331:338:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):514:521 -> a
+    331:338:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):504 -> a
+    339:341:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):505:507 -> a
+    342:342:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):506:506 -> a
+    343:348:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):527:532 -> a
+    349:351:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):540:542 -> a
+    1:4:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):697:700 -> b
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.o0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
@@ -61936,21 +61935,21 @@
     java.util.List val$mappedPositions -> j
     int emittedPc -> g
     java.util.List val$processedEvents -> l
-    1:1:void <clinit>():555:555 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.utils.Box,java.util.List):555:558 -> <init>
-    1:14:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):571:584 -> a
-    15:15:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):593:593 -> a
-    16:16:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):598:598 -> a
-    17:17:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):603:603 -> a
-    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):610:611 -> a
-    20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):616:617 -> a
-    22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):622:623 -> a
-    1:3:void flushPc():562:564 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.o0:
+    1:1:void <clinit>():567:567 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.utils.Box,java.util.List):567:570 -> <init>
+    1:14:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):583:596 -> a
+    15:15:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):605:605 -> a
+    16:16:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):610:610 -> a
+    17:17:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):615:615 -> a
+    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):622:623 -> a
+    20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):628:629 -> a
+    22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):634:635 -> a
+    1:3:void flushPc():574:576 -> f
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.p0:
     1:1:void <init>():67:67 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):67:67 -> <init>
     1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):71:71 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.utils.p0:
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.utils.q0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
     java.util.Map parsedKotlinSourceDebugExtensions -> c
@@ -61981,18 +61980,18 @@
     40:42:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):154 -> a
     43:53:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):155:165 -> a
     54:68:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):162:176 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.q0:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.r0:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
     com.android.tools.r8.graph.DexMethod method -> a
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.utils.LineNumberOptimizer$1):246:246 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int):253:257 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):246:246 -> a
+    1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):246:246 -> a
     1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):246:246 -> b
-    1:1:int access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):246:246 -> c
+    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):246:246 -> c
     1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):246:246 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.r0:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.s0:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -62002,7 +62001,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):81:81 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):77:85 -> <init>
     1:15:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):90:104 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.s0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.t0:
     java.util.List processedEvents -> f
     boolean $assertionsDisabled -> g
     int previousPc -> d
@@ -62020,13 +62019,13 @@
     3:15:void access$1000(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):203 -> a
     16:17:int getStartLine():240:241 -> a
     16:17:int access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):203 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.t0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.u0:
     com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.v0:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.w0:
     1:1:java.lang.Object last(java.util.List):20:20 -> a
     2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):24:25 -> a
     4:6:java.util.List map(java.util.Collection,java.util.function.Function):33:35 -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.w0:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.x0:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -62042,7 +62041,7 @@
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MainDexList -> com.android.tools.r8.utils.x0:
+com.android.tools.r8.utils.MainDexList -> com.android.tools.r8.utils.y0:
     1:9:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:29 -> a
     10:10:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -62057,7 +62056,7 @@
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     33:33:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     34:34:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.y0:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.z0:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -62071,7 +62070,7 @@
     1:1:int doHash(java.lang.Object):15:15 -> doHash
     2:5:int doHash(com.android.tools.r8.graph.DexMethod):47:50 -> doHash
     2:5:int doHash(java.lang.Object):15 -> doHash
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.z0:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.A0:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -62085,14 +62084,14 @@
     1:1:int doHash(java.lang.Object):14:14 -> doHash
     2:5:int doHash(com.android.tools.r8.graph.DexMethod):45:48 -> doHash
     2:5:int doHash(java.lang.Object):14 -> doHash
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.B0:
     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.B0:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.C0:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -62105,7 +62104,7 @@
     1:1:java.util.Set getClassDescriptors():54:54 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.utils.F0:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.utils.G0:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> e
     com.android.tools.r8.utils.OptionalBool TRUE -> c
     com.android.tools.r8.utils.OptionalBool FALSE -> d
@@ -62115,16 +62114,16 @@
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):54:54 -> a
     1:1:com.android.tools.r8.utils.OptionalBool unknown():58:58 -> g
     1:1:int hashCode():73:73 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.utils.D0:
     1:1:void <init>():10:10 -> <init>
     boolean isTrue() -> e
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.utils.D0:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.utils.E0:
     1:1:void <init>():24:24 -> <init>
     boolean isFalse() -> c
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.utils.E0:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.utils.F0:
     1:1:void <init>():38:38 -> <init>
     boolean isUnknown() -> f
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.H0:
     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
@@ -62132,14 +62131,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.G0$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.H0$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.H0:
+com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.I0:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -62162,14 +62161,14 @@
     25:25:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> c
     1:1:boolean hasNext():35:35 -> hasNext
     1:1:java.lang.Object next():13:13 -> next
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.I0:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.J0:
     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.J0:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.K0:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -62179,7 +62178,7 @@
     2:2:void setSecond(java.lang.Object):41:41 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.utils.K0:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.utils.L0:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -62187,7 +62186,7 @@
     2:2:void addPredicate(java.util.function.Predicate):24:24 -> a
     3:9:com.android.tools.r8.utils.PredicateSet rewriteItems(java.util.function.Function):28:34 -> a
     1:5:boolean contains(java.lang.Object):39:43 -> b
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.utils.L0:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.utils.M0:
     java.util.Map content -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.PreloadedClassFileProvider$1):19:19 -> <init>
     2:3:void <init>(java.util.Map):37:38 -> <init>
@@ -62197,8 +62196,8 @@
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):48:53 -> getProgramResource
     7:7:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):52:52 -> getProgramResource
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.utils.L0$a:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.L0$b:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.utils.M0$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.M0$b:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -62207,11 +62206,11 @@
     3:3:void <init>():76:76 -> <init>
     1:5:com.android.tools.r8.utils.PreloadedClassFileProvider$Builder addResource(java.lang.String,byte[]):82:86 -> a
     6:8:com.android.tools.r8.utils.PreloadedClassFileProvider build():91:93 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.utils.L0$c:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.utils.M0$c:
     java.lang.String descriptor -> a
     1:2:void <init>(java.lang.String):25:26 -> <init>
     1:1:java.lang.String part():31:31 -> part
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.M0:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.N0:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():21:21 -> <clinit>
@@ -62242,14 +62241,14 @@
     34:34:com.android.tools.r8.graph.DexEncodedMethod findConversionMethod(com.android.tools.r8.graph.DexProgramClass):119 -> a
     35:35:com.android.tools.r8.graph.DexEncodedMethod findConversionMethod(com.android.tools.r8.graph.DexProgramClass):119:119 -> a
     1:3:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:82 -> b
-    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> b
+    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():721:721 -> b
     4:4:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):83 -> b
     5:5:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):83:83 -> b
     6:8:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> b
     6:8:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> b
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():60:60 -> c
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.N0:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.O0:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.Diagnostic lastError -> c
     java.util.Collection suppressedExceptions -> d
@@ -62271,9 +62270,9 @@
     1:3:void error(com.android.tools.r8.Diagnostic):47:49 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):33:33 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.N0$a:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.O0$a:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.utils.O0:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.utils.P0:
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
     int size -> c
@@ -62286,9 +62285,9 @@
     5:44:com.android.tools.r8.utils.SegmentTree add(int,int,java.lang.Object):36:75 -> a
     45:48:boolean lambda$add$0(int,int,com.android.tools.r8.utils.Box,java.lang.Integer):43:46 -> a
     49:49:int size():80:80 -> a
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.P0:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.Q0:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.Q0:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.R0:
     1:2:byte[] StreamToByteArrayClose(java.io.InputStream):16:17 -> a
 com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.StringDiagnostic:
     com.android.tools.r8.origin.Origin origin -> a
@@ -62300,7 +62299,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.R0:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.S0:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -62339,7 +62338,7 @@
     1:9:java.lang.String toASCIIString(java.lang.String):49:57 -> e
     1:9:java.lang.String trim(java.lang.String):288:296 -> f
     1:5:java.lang.String withNativeLineSeparator(java.lang.String):155:159 -> g
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.R0$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.S0$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
@@ -62348,7 +62347,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.S0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.T0:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -62357,126 +62356,202 @@
     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.S0$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.T0$a:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> b
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> a
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.T0:
-    1:9:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):21:29 -> a
-    10:10:java.lang.Object lambda$processItems$0(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object):25:25 -> a
-    11:24:void awaitFutures(java.lang.Iterable):34:47 -> a
-    25:35:void awaitFutures(java.lang.Iterable):40:50 -> a
-    36:37:java.util.concurrent.ExecutorService getExecutorService(int):64:65 -> a
-    38:38:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):69:69 -> a
-    1:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):57:58 -> b
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.U0:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.V0:
+com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.U0:
+    1:3:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):23:25 -> a
+    4:18:java.util.Collection awaitFuturesWithResults(java.util.Collection):67:81 -> a
+    4:18:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):27 -> a
+    19:29:java.util.Collection awaitFuturesWithResults(java.util.Collection):74:84 -> a
+    19:29:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):27 -> a
+    30:30:java.lang.Object lambda$processItemsWithResults$0(com.android.tools.r8.utils.ThrowingFunction,java.lang.Object):25:25 -> a
+    31:31:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):33:33 -> a
+    32:32:java.lang.Object lambda$processItems$1(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object):36:36 -> a
+    33:46:void awaitFutures(java.lang.Iterable):44:57 -> a
+    47:57:void awaitFutures(java.lang.Iterable):50:60 -> a
+    58:59:java.util.concurrent.ExecutorService getExecutorService(int):99:100 -> a
+    60:60:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):104:104 -> a
+    1:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):92:93 -> b
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.V0:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.W0:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.W0:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.X0:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.X0:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.utils.Y0:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.Z0:
     1:1:void <init>():9:9 -> <init>
     boolean hasNext() -> a
     1:2:void forEachRemaining(java.util.function.IntConsumer):12:13 -> a
     3:6:int nextIntComputeIfAbsent(com.android.tools.r8.utils.ThrowingIntSupplier):22:25 -> a
     int nextInt() -> b
-com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.Y0:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.a1:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.Z0:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.b1:
     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.a1:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.b1:
-    java.util.Stack stack -> a
-    boolean trackMemory -> b
-    1:1:void <init>():27:27 -> <init>
-    2:2:void <init>(java.lang.String):31:31 -> <init>
-    3:6:void <init>(java.lang.String,boolean):34:37 -> <init>
-    1:1:boolean access$000(com.android.tools.r8.utils.Timing):21:21 -> a
-    2:2:java.lang.String prettySize(long):149:149 -> a
-    2:2:java.lang.String access$400(long):21 -> a
-    3:19:java.lang.String prettyNumber(long):153:169 -> a
-    3:19:java.lang.String prettySize(long):149 -> a
-    3:19:java.lang.String access$400(long):21 -> a
-    20:20:java.lang.String prettySize(long):149:149 -> a
-    20:20:java.lang.String access$400(long):21 -> a
-    21:24:void begin(java.lang.String):173:176 -> a
-    25:26:void com.android.tools.r8.utils.Timing$Node.restart():74:75 -> a
-    25:26:void begin(java.lang.String):177 -> a
-    27:27:boolean access$000(com.android.tools.r8.utils.Timing):21:21 -> a
-    27:27:void com.android.tools.r8.utils.Timing$Node.restart():75 -> a
-    27:27:void begin(java.lang.String):177 -> a
-    28:30:void com.android.tools.r8.utils.Timing$Node.restart():76:78 -> a
-    28:30:void begin(java.lang.String):177 -> a
-    31:34:void begin(java.lang.String):179:182 -> a
-    35:36:void end():186:187 -> a
-    1:4:void report():191:194 -> b
-    5:10:java.util.Map computeMemoryInformation():211:216 -> b
-    5:10:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
-    11:11:com.android.tools.r8.utils.Timing$MemInfo com.android.tools.r8.utils.Timing$MemInfo.fromTotalAndFree(long,long):48:48 -> b
-    11:11:java.util.Map computeMemoryInformation():215 -> b
-    11:11:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
-    12:12:java.util.Map computeMemoryInformation():213:213 -> b
-    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.b1$a:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.c1:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.e1:
+    java.util.Stack stack -> b
+    com.android.tools.r8.utils.Timing EMPTY -> d
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.utils.Timing$Node top -> a
+    boolean trackMemory -> c
+    1:5:void <clinit>():25:29 -> <clinit>
+    1:1:void <init>(java.lang.String,boolean,com.android.tools.r8.utils.Timing$1):25:25 -> <init>
+    2:2:void <init>(java.lang.String):84:84 -> <init>
+    3:7:void <init>(java.lang.String,boolean):87:91 -> <init>
+    1:1:com.android.tools.r8.utils.Timing$Node access$1100(com.android.tools.r8.utils.Timing):25:25 -> a
+    2:4:com.android.tools.r8.utils.Timing create(java.lang.String,com.android.tools.r8.utils.InternalOptions):73:75 -> a
+    5:5:com.android.tools.r8.utils.Timing create(java.lang.String,com.android.tools.r8.utils.InternalOptions):74:74 -> a
+    6:6:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):317:317 -> a
+    7:7:java.lang.String prettyPercentage(long,long):325:325 -> a
+    7:7:java.lang.String access$400(long,long):25 -> a
+    8:8:long percentage(long,long):321:321 -> a
+    8:8:java.lang.String prettyPercentage(long,long):325 -> a
+    8:8:java.lang.String access$400(long,long):25 -> a
+    9:9:java.lang.String prettyPercentage(long,long):325:325 -> a
+    9:9:java.lang.String access$400(long,long):25 -> a
+    10:10:java.lang.String prettyTime(long):329:329 -> a
+    10:10:java.lang.String access$300(long):25 -> a
+    11:14:void begin(java.lang.String):357:360 -> a
+    15:19:void com.android.tools.r8.utils.Timing$Node.restart():130:134 -> a
+    15:19:void begin(java.lang.String):361 -> a
+    20:23:void begin(java.lang.String):363:366 -> a
+    24:29:java.util.Map computeMemoryInformation():397:402 -> a
+    24:29:java.util.Map access$200():25 -> a
+    30:30:com.android.tools.r8.utils.Timing$MemInfo com.android.tools.r8.utils.Timing$MemInfo.fromTotalAndFree(long,long):102:102 -> a
+    30:30:java.util.Map computeMemoryInformation():401 -> a
+    30:30:java.util.Map access$200():25 -> a
+    31:31:java.util.Map computeMemoryInformation():399:399 -> a
+    31:31:java.util.Map access$200():25 -> a
+    1:1:java.util.Stack access$700(com.android.tools.r8.utils.Timing):25:25 -> b
+    2:2:com.android.tools.r8.utils.Timing empty():68:68 -> b
+    3:3:long percentage(long,long):321:321 -> b
+    3:3:long access$500(long,long):25 -> b
+    4:4:java.lang.String prettySize(long):333:333 -> b
+    4:4:java.lang.String access$600(long):25 -> b
+    5:21:java.lang.String prettyNumber(long):337:353 -> b
+    5:21:java.lang.String prettySize(long):333 -> b
+    5:21:java.lang.String access$600(long):25 -> b
+    22:22:java.lang.String prettySize(long):333:333 -> b
+    22:22:java.lang.String access$600(long):25 -> b
+    1:1:boolean access$800(com.android.tools.r8.utils.Timing):25:25 -> c
+    2:3:void end():370:371 -> c
+    1:6:void report():375:380 -> d
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.utils.e1$a:
+    1:1:void <init>(java.lang.String,boolean):30:30 -> <init>
+    void begin(java.lang.String) -> a
+    1:1:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):33:33 -> a
+    void end() -> c
+    void report() -> d
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.utils.d1:
+    1:1:void <init>(com.android.tools.r8.utils.Timing$1,java.lang.String,int,com.android.tools.r8.utils.Timing):33:33 -> <init>
+    void add(java.util.Collection) -> a
+    void end() -> a
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.e1$b:
     long used -> a
-    1:2:void <init>(long):43:44 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.b1$b:
-    com.android.tools.r8.utils.Timing this$0 -> g
-    java.util.Map children -> b
+    1:2:void <init>(long):97:98 -> <init>
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.e1$c:
+    java.util.Map children -> c
+    long start_time -> e
     java.lang.String title -> a
-    long start_time -> d
+    long duration -> d
     boolean $assertionsDisabled -> h
-    long duration -> c
-    java.util.Map startMemory -> e
-    java.util.Map endMemory -> f
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.Timing,java.lang.String):65:65 -> <init>
-    2:13:void <init>(com.android.tools.r8.utils.Timing,java.lang.String):59:70 -> <init>
-    1:5:void end():82:86 -> a
-    6:6:void report(int,com.android.tools.r8.utils.Timing$Node):105:105 -> a
-    7:7:long duration():91:91 -> a
-    7:7:void report(int,com.android.tools.r8.utils.Timing$Node):105 -> a
-    8:15:void report(int,com.android.tools.r8.utils.Timing$Node):105:112 -> a
-    16:17:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):100:101 -> a
-    16:17:void report(int,com.android.tools.r8.utils.Timing$Node):112 -> a
-    18:18:long duration():91:91 -> a
-    18:18:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):101 -> a
-    18:18:void report(int,com.android.tools.r8.utils.Timing$Node):112 -> a
-    19:19:java.lang.String com.android.tools.r8.utils.Timing.prettyPercentage(long,long):141:141 -> a
-    19:19:java.lang.String com.android.tools.r8.utils.Timing.access$300(long,long):21 -> a
-    19:19:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):101 -> a
-    19:19:void report(int,com.android.tools.r8.utils.Timing$Node):112 -> a
-    20:20:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):101:101 -> a
-    20:20:void report(int,com.android.tools.r8.utils.Timing$Node):112 -> a
-    21:22:void report(int,com.android.tools.r8.utils.Timing$Node):112:113 -> a
-    23:35:void printMemory(int):120:132 -> a
-    23:35:void report(int,com.android.tools.r8.utils.Timing$Node):114 -> a
-    36:36:long com.android.tools.r8.utils.Timing$MemInfo.usedDelta(com.android.tools.r8.utils.Timing$MemInfo):52:52 -> a
-    36:36:void printMemory(int):134 -> a
-    36:36:void report(int,com.android.tools.r8.utils.Timing$Node):114 -> a
-    37:37:void printMemory(int):134:134 -> a
-    37:37:void report(int,com.android.tools.r8.utils.Timing$Node):114 -> a
-    38:38:void printMemory(int):127:127 -> a
-    38:38:void report(int,com.android.tools.r8.utils.Timing$Node):114 -> a
-    39:39:void report(int,com.android.tools.r8.utils.Timing$Node):116:116 -> a
-    40:40:void lambda$report$0(int,com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):116:116 -> a
-    1:1:java.lang.String toString():96:96 -> toString
-    2:2:long duration():91:91 -> toString
-    2:2:java.lang.String toString():96 -> toString
-    3:3:java.lang.String com.android.tools.r8.utils.Timing.prettyTime(long):145:145 -> toString
-    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.c1:
+    boolean trackMemory -> b
+    java.util.Map startMemory -> f
+    java.util.Map endMemory -> g
+    1:1:void <clinit>():110:110 -> <clinit>
+    1:1:void <init>(java.lang.String,boolean):120:120 -> <init>
+    2:14:void <init>(java.lang.String,boolean):114:126 -> <init>
+    1:5:void end():138:142 -> a
+    6:7:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):156:157 -> a
+    8:8:long duration():147:147 -> a
+    8:8:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):157 -> a
+    9:9:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):157:157 -> a
+    10:10:void report(int,com.android.tools.r8.utils.Timing$Node):161:161 -> a
+    11:11:long duration():147:147 -> a
+    11:11:void report(int,com.android.tools.r8.utils.Timing$Node):161 -> a
+    12:12:void report(int,com.android.tools.r8.utils.Timing$Node):161:161 -> a
+    13:13:long duration():147:147 -> a
+    13:13:void report(int,com.android.tools.r8.utils.Timing$Node):162 -> a
+    14:27:void report(int,com.android.tools.r8.utils.Timing$Node):162:175 -> a
+    28:28:long duration():147:147 -> a
+    28:28:void report(int,com.android.tools.r8.utils.Timing$Node):176 -> a
+    29:29:long duration():147:147 -> a
+    29:29:void report(int,com.android.tools.r8.utils.Timing$Node):178 -> a
+    30:30:long duration():147:147 -> a
+    30:30:void report(int,com.android.tools.r8.utils.Timing$Node):180 -> a
+    31:31:long com.android.tools.r8.utils.Timing.percentage(long,long):321:321 -> a
+    31:31:long com.android.tools.r8.utils.Timing.access$500(long,long):25 -> a
+    31:31:void report(int,com.android.tools.r8.utils.Timing$Node):180 -> a
+    32:33:void report(int,com.android.tools.r8.utils.Timing$Node):181:182 -> a
+    34:34:long duration():147:147 -> a
+    34:34:void report(int,com.android.tools.r8.utils.Timing$Node):184 -> a
+    35:35:void report(int,com.android.tools.r8.utils.Timing$Node):184:184 -> a
+    36:36:java.lang.String com.android.tools.r8.utils.Timing.prettyTime(long):329:329 -> a
+    36:36:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> a
+    36:36:void report(int,com.android.tools.r8.utils.Timing$Node):186 -> a
+    37:37:void report(int,com.android.tools.r8.utils.Timing$Node):186:186 -> a
+    38:45:void report(int,com.android.tools.r8.utils.Timing$Node):182:189 -> a
+    46:46:void lambda$report$0(int,com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):189:189 -> a
+    47:59:void printMemory(int):201:213 -> a
+    60:60:long com.android.tools.r8.utils.Timing$MemInfo.usedDelta(com.android.tools.r8.utils.Timing$MemInfo):106:106 -> a
+    60:60:void printMemory(int):215 -> a
+    61:61:void printMemory(int):215:215 -> a
+    62:62:void printMemory(int):208:208 -> a
+    1:2:void printPrefix(int):195:196 -> b
+    1:1:java.lang.String toString():152:152 -> toString
+    2:2:long duration():147:147 -> toString
+    2:2:java.lang.String toString():152 -> toString
+    3:3:java.lang.String toString():152:152 -> toString
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.utils.e1$d:
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.utils.Timing$Node slowest -> d
+    int taskCount -> c
+    com.android.tools.r8.utils.Timing$Node parent -> a
+    com.android.tools.r8.utils.Timing$Node merged -> b
+    1:1:void <clinit>():221:221 -> <clinit>
+    1:1:void <init>(java.lang.String,int,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.Timing$1):221:221 -> <init>
+    2:2:void <init>(java.lang.String,int,com.android.tools.r8.utils.Timing):228:228 -> <init>
+    3:9:void <init>(java.lang.String,int,com.android.tools.r8.utils.Timing):225:231 -> <init>
+    1:1:com.android.tools.r8.utils.Timing$Node access$1000(com.android.tools.r8.utils.Timing$TimingMerger):221:221 -> a
+    2:18:void add(java.util.Collection):282:298 -> a
+    19:23:void lambda$add$1(com.android.tools.r8.utils.Timing$TimingMerger$Item,boolean,java.util.Deque,java.lang.String,com.android.tools.r8.utils.Timing$Node):300:304 -> a
+    24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):301:301 -> a
+    25:26:void end():311:312 -> a
+    1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):221:221 -> b
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.utils.f1:
+    boolean $assertionsDisabled -> k
+    int val$numberOfThreads -> i
+    com.android.tools.r8.utils.Timing$TimingMerger this$0 -> j
+    1:1:void <clinit>():231:231 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.Timing$TimingMerger,java.lang.String,boolean,int):231:231 -> <init>
+    1:1:void report(int,com.android.tools.r8.utils.Timing$Node):234:234 -> a
+    2:2:long com.android.tools.r8.utils.Timing$Node.duration():147:147 -> a
+    2:2:void report(int,com.android.tools.r8.utils.Timing$Node):234 -> a
+    3:9:void report(int,com.android.tools.r8.utils.Timing$Node):234:240 -> a
+    10:10:long com.android.tools.r8.utils.Timing$Node.duration():147:147 -> a
+    10:10:void report(int,com.android.tools.r8.utils.Timing$Node):240 -> a
+    11:11:long com.android.tools.r8.utils.Timing$Node.duration():147:147 -> a
+    11:11:void report(int,com.android.tools.r8.utils.Timing$Node):241 -> a
+    12:19:void report(int,com.android.tools.r8.utils.Timing$Node):241:248 -> a
+    20:38:void report(int,com.android.tools.r8.utils.Timing$Node):242:260 -> a
+    39:39:void lambda$report$0(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):255:255 -> a
+    1:1:void lambda$report$1(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):260:260 -> b
+    1:1:java.lang.String toString():266:266 -> toString
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.utils.g1:
+    com.android.tools.r8.utils.Timing$Node mergeTarget -> a
+    com.android.tools.r8.utils.Timing$Node mergeSource -> b
+    1:3:void <init>(com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):275:277 -> <init>
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.h1:
     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.d1:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.i1:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -62495,7 +62570,7 @@
     2:2:java.lang.String getSha():57:57 -> b
     1:1:boolean isEngineering():66:66 -> c
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.ZipUtils -> com.android.tools.r8.utils.e1:
+com.android.tools.r8.utils.ZipUtils -> com.android.tools.r8.utils.j1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
     boolean lambda$unzip$1(java.util.zip.ZipEntry) -> a
@@ -62504,8 +62579,8 @@
     20:24:void iter(java.lang.String,com.android.tools.r8.utils.ZipUtils$OnEntryHandler):69:73 -> a
     25:33:void iter(java.lang.String,com.android.tools.r8.utils.ZipUtils$OnEntryHandler):65:73 -> a
     34:34:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):73:73 -> a
-    35:46:void zip(java.nio.file.Path,java.nio.file.Path):77:88 -> a
-    47:58:void zip(java.nio.file.Path,java.nio.file.Path):77:88 -> a
+    35:47:void zip(java.nio.file.Path,java.nio.file.Path):77:77 -> a
+    58:58:void zip(java.nio.file.Path,java.nio.file.Path):88:88 -> a
     59:59:boolean lambda$zip$0(java.nio.file.Path):80:80 -> a
     60:60:java.util.List unzip(java.lang.String,java.io.File):92:92 -> a
     61:63:java.util.List unzip(java.lang.String,java.io.File,java.util.function.Predicate):97:99 -> a
@@ -62519,5 +62594,5 @@
     84:96:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):127:139 -> a
     97:104:boolean isClassFile(java.lang.String):148:155 -> a
     1:2:boolean isDexFile(java.lang.String):143:144 -> b
-com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.e1$a:
+com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.j1$a:
     void onEntry(java.util.zip.ZipEntry,java.io.InputStream) -> a